summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cups
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-extended/cups
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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/cups')
-rw-r--r--meta/recipes-extended/cups/cups.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index e4771f7c80..fd885527c2 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -14,8 +14,8 @@ LEAD_SONAME = "libcupsdriver.so"
14 14
15inherit autotools-brokensep binconfig 15inherit autotools-brokensep binconfig
16 16
17PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
18 ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 18 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
19PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" 19PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
21PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" 21PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"