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-devtools/gdb/gdb_7.12.1.bb | 2 +- meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +- meta/recipes-devtools/patch/patch_2.7.5.bb | 2 +- meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 2 +- meta/recipes-devtools/python/python-smartpm_git.bb | 4 ++-- meta/recipes-devtools/qemu/qemu.inc | 3 +-- meta/recipes-devtools/rsync/rsync_2.6.9.bb | 2 +- meta/recipes-devtools/rsync/rsync_3.1.2.bb | 2 +- meta/recipes-devtools/ruby/ruby_2.3.3.bb | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gdb/gdb_7.12.1.bb b/meta/recipes-devtools/gdb/gdb_7.12.1.bb index 4fddf81ffa..ea8fef122c 100644 --- a/meta/recipes-devtools/gdb/gdb_7.12.1.bb +++ b/meta/recipes-devtools/gdb/gdb_7.12.1.bb @@ -10,7 +10,7 @@ EXTRA_OEMAKE_append_libc-musl = "\ " do_configure_prepend() { - if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then + if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh case "\$2" in diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index d09ac841ec..30cf13c0dd 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -26,7 +26,7 @@ S = "${WORKDIR}/git/" # xattr support creates an additional compile-time dependency on acl because # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr # regardless whether acl is enabled or disabled in the distro should be okay. -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = ",,acl," EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" diff --git a/meta/recipes-devtools/patch/patch_2.7.5.bb b/meta/recipes-devtools/patch/patch_2.7.5.bb index f3fcf5e86d..151f021b2c 100644 --- a/meta/recipes-devtools/patch/patch_2.7.5.bb +++ b/meta/recipes-devtools/patch/patch_2.7.5.bb @@ -10,6 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" acpaths = "-I ${S}/m4 " -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb index a032a22c22..dabb4db382 100644 --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb +++ b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb @@ -29,7 +29,7 @@ BBCLASSEXTEND = "native" inherit autotools pkgconfig -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ " PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb index 6daabf49a6..31c273deaf 100644 --- a/meta/recipes-devtools/python/python-smartpm_git.bb +++ b/meta/recipes-devtools/python/python-smartpm_git.bb @@ -81,12 +81,12 @@ do_install_append() { # Disable zypper channel support rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/zyppchannelsync.py* - if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'rpm', d)}" ]; then rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/rpmdir.py* rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/backends/rpm fi - if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'qt4', d)}" ]; then rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/interfaces/qt4 fi diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index cdbb7f1671..2b82e8fd02 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -100,8 +100,7 @@ do_install_append() { PACKAGECONFIG ??= " \ fdt sdl \ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " PACKAGECONFIG_class-native ??= "fdt alsa uuid" PACKAGECONFIG_class-nativesdk ??= "fdt sdl" diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb index efdf255a07..17f1d31945 100644 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" PR = "r4" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb index c6cb3310fc..103198487b 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" PACKAGECONFIG ??= "acl attr \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," diff --git a/meta/recipes-devtools/ruby/ruby_2.3.3.bb b/meta/recipes-devtools/ruby/ruby_2.3.3.bb index 7ba9b46a17..e460139a65 100644 --- a/meta/recipes-devtools/ruby/ruby_2.3.3.bb +++ b/meta/recipes-devtools/ruby/ruby_2.3.3.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a7305 UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" -- cgit 1.2.3-korg