| Message ID | 20230308224442.33516-2-twoerner@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | a053dd177ddc99ced11e68914079be0ffe261262 |
| Headers | show |
| Series | [1/3] cups: use BUILDROOT instead of DESTDIR | expand |
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b8b655a4fb85..1b522d7d8535 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -74,7 +74,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
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 <twoerner@gmail.com> --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)