From: Trevor Woerner Date: Wed, 8 Mar 2023 22:44:41 +0000 (-0500) Subject: cups: check PACKAGECONFIG for pam feature X-Git-Tag: yocto-4.0.9~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b23927a72a1f8b91802f5b2ca10f2cea239bd47;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git cups: check PACKAGECONFIG for pam feature The cups' PACKAGECONFIG is populated based on DISTRO_FEATURES, but a user is free to enable or disable PACKAGECONFIGs at will. In theory it is possible that pam is enabled globally in DISTRO_FEATURES but disabled in cups' PACKAGECONFIG. Checking the PACKAGECONFIG to determine whether or not pam is enabled would be a safer check rather than relying on DISTRO_FEATURES. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit a053dd177ddc99ced11e68914079be0ffe261262) Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index cf06c9f1b85..714be4b26c1 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -75,7 +75,7 @@ do_install () { rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions - if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then chmod 0644 ${D}${sysconfdir}/pam.d/cups fi