summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2023-03-08 17:44:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-23 22:45:34 +0000
commit86ea4bde713d30f152792806197f120d170490bb (patch)
treed434315e041feaee5962d3912603d1bd50b6bda4 /meta/recipes-extended
parent618e519a15cf7d870f013dbafae120cac97b30cd (diff)
downloadpoky-86ea4bde713d30f152792806197f120d170490bb.tar.gz
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. (From OE-Core rev: 7b23927a72a1f8b91802f5b2ca10f2cea239bd47) Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit a053dd177ddc99ced11e68914079be0ffe261262) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/cups/cups.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index cf06c9f1b8..714be4b26c 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -75,7 +75,7 @@ do_install () {
75 rmdir ${D}/${libexecdir}/${BPN}/driver 75 rmdir ${D}/${libexecdir}/${BPN}/driver
76 76
77 # Fix the pam configuration file permissions 77 # Fix the pam configuration file permissions
78 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then 78 if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then
79 chmod 0644 ${D}${sysconfdir}/pam.d/cups 79 chmod 0644 ${D}${sysconfdir}/pam.d/cups
80 fi 80 fi
81 81