diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-extended/pam | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pam')
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index 7c0111fb04..7e55adfb04 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb | |||
@@ -131,13 +131,13 @@ do_install() { | |||
131 | # The lsb requires unix_chkpwd has setuid permission | 131 | # The lsb requires unix_chkpwd has setuid permission |
132 | chmod 4755 ${D}${sbindir}/unix_chkpwd | 132 | chmod 4755 ${D}${sbindir}/unix_chkpwd |
133 | 133 | ||
134 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 134 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
135 | echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session | 135 | echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session |
136 | fi | 136 | fi |
137 | } | 137 | } |
138 | 138 | ||
139 | python do_pam_sanity () { | 139 | python do_pam_sanity () { |
140 | if not base_contains('DISTRO_FEATURES', 'pam', True, False, d): | 140 | if not bb.utils.contains('DISTRO_FEATURES', 'pam', True, False, d): |
141 | bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") | 141 | bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") |
142 | } | 142 | } |
143 | addtask pam_sanity before do_configure | 143 | addtask pam_sanity before do_configure |