From c61b8157fba01dc84681d065591247a565263a64 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 2 Jul 2020 13:43:45 +0800 Subject: [PATCH] tpm2-tss: support usrmerge fix do_package_qa error: ERROR: QA Issue: tpm2-tss package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Changqing Li --- meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb index 135efed..1afd67e 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb @@ -20,7 +20,7 @@ inherit autotools pkgconfig systemd extrausers PACKAGECONFIG ??= "" PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " -EXTRA_OECONF += "--enable-static --with-udevrulesdir=${base_prefix}/lib/udev/rules.d/" +EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" EXTRA_OECONF_remove = " --disable-static" @@ -76,6 +76,6 @@ FILES_libtss2-dev = " \ ${libdir}/libtss2*so" FILES_libtss2-staticdev = "${libdir}/libtss*a" -FILES_${PN} = "${libdir}/udev ${base_prefix}/lib/udev" +FILES_${PN} = "${libdir}/udev ${nonarch_base_libdir}/udev" RDEPENDS_libtss2 = "libgcrypt"