From 46b4d4c257157242e9a94acf19ac52eb8c77a728 Mon Sep 17 00:00:00 2001 From: Daniel McGregor Date: Thu, 19 Sep 2024 10:25:00 -0600 Subject: [PATCH] libpam: use libdir in conditional Using the usrmerge distro feature for this check causes the -native variant's build to fail. Simplify the test to be correct for both native and target builds. (From OE-Core rev: ba11742291bccc9ac4d30ca85b058576cbc17427) Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie (cherry picked from commit 105e6fbdd28238cef41f280c0c28939b24d1a96e) Signed-off-by: Steve Sakoman --- meta/recipes-extended/pam/libpam_1.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam_1.6.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index b9ef564f56..c9ef40bf23 100644 --- a/meta/recipes-extended/pam/libpam_1.6.1.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb @@ -155,7 +155,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + if [ "${base_libdir}" != "${libdir}" ]; then install -d ${D}/${libdir}/ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ fi