From 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 27 Feb 2017 14:02:50 +0100 Subject: recipes: Make use of the new bb.utils.filter() function Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr_1.5.2.bb | 2 +- meta/recipes-support/boost/boost.inc | 4 ++-- meta/recipes-support/consolekit/consolekit_0.4.6.bb | 3 +-- meta/recipes-support/curl/curl_7.52.1.bb | 2 +- meta/recipes-support/libcap/libcap_2.25.bb | 2 +- meta/recipes-support/nspr/nspr_4.13.1.bb | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb index f560c8b9c4..079f8cd654 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb @@ -39,7 +39,7 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct # x86_64-linux-libtool: error: specify a tag with '--tag' CCACHE = "" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_configure_prepend() { diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 0b2b17d032..87b6b884f2 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -45,9 +45,9 @@ PACKAGECONFIG[mpi] = ",,mpich" PACKAGECONFIG[python] = ",,python python3" BOOST_LIBS += "\ - ${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \ + ${@bb.utils.filter('PACKAGECONFIG', 'locale', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \ - bb.utils.contains('PACKAGECONFIG', 'mpi', 'mpi', '', d), d)} \ + bb.utils.filter('PACKAGECONFIG', 'mpi', d), d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \ " diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index ceac0fe31a..80d48bf84f 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -23,8 +23,7 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464 S = "${WORKDIR}/ConsoleKit-${PV}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit" diff --git a/meta/recipes-support/curl/curl_7.52.1.bb b/meta/recipes-support/curl/curl_7.52.1.bb index 2882bc08cc..a61420423c 100644 --- a/meta/recipes-support/curl/curl_7.52.1.bb +++ b/meta/recipes-support/curl/curl_7.52.1.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls proxy zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy zlib" PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl zlib" diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb index 343aeb6c40..26d7bf2a6e 100644 --- a/meta/recipes-support/libcap/libcap_2.25.bb +++ b/meta/recipes-support/libcap/libcap_2.25.bb @@ -27,7 +27,7 @@ do_configure() { sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile } -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" PACKAGECONFIG_class-native ??= "" diff --git a/meta/recipes-support/nspr/nspr_4.13.1.bb b/meta/recipes-support/nspr/nspr_4.13.1.bb index 23f8944a87..343800c80f 100644 --- a/meta/recipes-support/nspr/nspr_4.13.1.bb +++ b/meta/recipes-support/nspr/nspr_4.13.1.bb @@ -147,7 +147,7 @@ TESTS = " \ inherit autotools -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_compile_prepend() { -- cgit 1.2.3-korg