aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel McGregor <daniel.mcgregor@vecima.com>2022-04-12 20:24:50 -0600
committerDaniel McGregor <daniel.mcgregor@vecima.com>2022-09-27 09:19:07 -0600
commit58dfc901f9961bd63650f797cf8e035e193f31ad (patch)
tree50d22a26411904319353ad3fe9a1c75702a8e89d
parent59484ecddd81631839ea05398489815fe08d5887 (diff)
downloadopenembedded-core-contrib-dankm/sstate.tar.gz
libpam: use libdir in conditionaldankm/sstate
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. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
-rw-r--r--meta/recipes-extended/pam/libpam_1.5.2.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
index bde7fef8a2..1c97a16906 100644
--- a/meta/recipes-extended/pam/libpam_1.5.2.bb
+++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
@@ -148,7 +148,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