From 7d3b5e8af37abd1e173cde4a50b06c2a146ef4a5 Mon Sep 17 00:00:00 2001 From: Zoltán Böszörményi Date: Tue, 12 Oct 2021 13:17:26 +0200 Subject: libpam: Fix build with DISTRO_FEATURES usrmerge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (From OE-Core rev: 71780bb9ac3c9e096888128d9cf3441c1758d816) Signed-off-by: Zoltán Böszörményi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-extended/pam/libpam_1.5.2.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended/pam') 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() { -- cgit v1.2.3-54-g00ecf