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-graphics/xorg-lib/libice_1.0.9.bb | 2 +- meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb | 2 +- meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb | 2 +- meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-graphics/xorg-lib') diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb index b361ad6ddd..f069749ce0 100644 --- a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb @@ -23,6 +23,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index da4ed92510..48922cb992 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -27,5 +27,5 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb index 402ab0d724..4bfb290ae1 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb @@ -18,5 +18,5 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5" SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb index a5694a338e..b11dda57e0 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79" SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb index 07be028f1f..81df1dd8db 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb @@ -18,5 +18,5 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-docs" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb index d5935ff349..4740c15732 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb @@ -31,5 +31,5 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- cgit 1.2.3-korg