aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltán Böszörményi <zboszor@gmail.com>2021-10-12 13:17:26 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2021-10-13 16:02:05 +0200
commitf6fa3545709be32c9b602780c8e6e24041efd60a (patch)
tree2dab7c4da2320eef7d31daee68279858fe81e7aa
parent3c98bef354d2270bd8dcbbffc4da3b473c75149c (diff)
downloadopenembedded-core-contrib-abelloni/master-next-success.tar.gz
openembedded-core-contrib-abelloni/master-next-success.tar.bz2
openembedded-core-contrib-abelloni/master-next-success.zip
libpam: Fix build with DISTRO_FEATURES usrmergeabelloni/master-next-success
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--meta/recipes-extended/pam/libpam_1.5.2.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
index a3c4a50cb3..ee3a84a3b6 100644
--- a/meta/recipes-extended/pam/libpam_1.5.2.bb
+++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
@@ -147,8 +147,10 @@ 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
- install -d ${D}/${libdir}/
- mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+ install -d ${D}/${libdir}/
+ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+ fi
}
do_install_ptest() {