diff options
author | Trevor Woerner <twoerner@gmail.com> | 2023-03-08 17:44:41 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-21 14:26:31 +0000 |
commit | c7202a46da4fd80357e42d7b77c73e99edc2db28 (patch) | |
tree | 971475cc7301a08dbbb652bf5b0c7dae7d337196 | |
parent | 28b0c61d7d9ef455390b0ee899d6b1a6e3544663 (diff) | |
download | poky-c7202a46da4fd80357e42d7b77c73e99edc2db28.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: 2dd5c6ccdce2e402de234df3695a9058a8a126db)
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>
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b8b655a4fb..1b522d7d85 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -74,7 +74,7 @@ do_install () { | |||
74 | rmdir ${D}/${libexecdir}/${BPN}/driver | 74 | rmdir ${D}/${libexecdir}/${BPN}/driver |
75 | 75 | ||
76 | # Fix the pam configuration file permissions | 76 | # Fix the pam configuration file permissions |
77 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 77 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then |
78 | chmod 0644 ${D}${sysconfdir}/pam.d/cups | 78 | chmod 0644 ${D}${sysconfdir}/pam.d/cups |
79 | fi | 79 | fi |
80 | 80 | ||