1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

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 <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 105e6fbdd28238cef41f280c0c28939b24d1a96e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Daniel McGregor
2024-09-19 10:25:00 -06:00
committed by Steve Sakoman
parent 80e1dff59f
commit 46b4d4c257
+1 -1
View File
@@ -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