diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:50 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-05-05 11:41:28 -0400 |
| commit | 275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802 (patch) | |
| tree | 4fd20a242b848ec8497066801b86706de3defdce /meta-networking/recipes-daemons/squid | |
| parent | 7a9c626092c7d3b10206c7ca4ea2827cca9cba4f (diff) | |
| download | meta-openembedded-275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802.tar.gz | |
meta-networking: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/squid_3.5.7.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.7.bb b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb index a94fed7e55..c3eabcdb3c 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.7.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb @@ -34,15 +34,15 @@ inherit autotools useradd ptest USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ + ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ " PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," BASIC_AUTH = "DB SASL LDAP NIS" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" |