summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorZoltán Böszörményi <zboszor@gmail.com>2021-10-12 13:17:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-14 11:48:46 +0100
commit7d3b5e8af37abd1e173cde4a50b06c2a146ef4a5 (patch)
tree811f307f10d80594a2127e550be9b0445a14e006 /meta/recipes-extended
parent1c6080c4b7c019d9dd665aabecf55aa1b4155dd2 (diff)
downloadpoky-7d3b5e8af37abd1e173cde4a50b06c2a146ef4a5.tar.gz
libpam: Fix build with DISTRO_FEATURES usrmerge
(From OE-Core rev: 71780bb9ac3c9e096888128d9cf3441c1758d816) Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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() {
147 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 147 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
148 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session 148 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
149 fi 149 fi
150 install -d ${D}/${libdir}/ 150 if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
151 mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ 151 install -d ${D}/${libdir}/
152 mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
153 fi
152} 154}
153 155
154do_install_ptest() { 156do_install_ptest() {