summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-02-27 14:02:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 11:17:45 +0000
commit254bfb107134702d8d1e0bfbdd1b011212e8c291 (patch)
tree188ddf3ea786bc1b913904330e4f95125bd6def4 /meta
parentdec5650bc292aa3c4a0a04ace72d2cf762e9620b (diff)
downloadpoky-254bfb107134702d8d1e0bfbdd1b011212e8c291.tar.gz
recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass2
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc4
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc2
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb2
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.4p1.bb4
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc4
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb2
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.26.bb3
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.14.bb4
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc6
-rw-r--r--meta/recipes-core/kbd/kbd_2.0.3.bb2
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.4.bb2
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb4
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.12.1.bb2
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb2
-rw-r--r--meta/recipes-devtools/patch/patch_2.7.5.bb2
-rw-r--r--meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb2
-rw-r--r--meta/recipes-devtools/python/python-smartpm_git.bb4
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc3
-rw-r--r--meta/recipes-devtools/rsync/rsync_2.6.9.bb2
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.2.bb2
-rw-r--r--meta/recipes-devtools/ruby/ruby_2.3.3.bb2
-rw-r--r--meta/recipes-extended/at/at_3.1.20.bb2
-rw-r--r--meta/recipes-extended/cronie/cronie_1.5.1.bb2
-rw-r--r--meta/recipes-extended/cups/cups.inc3
-rw-r--r--meta/recipes-extended/iptables/iptables_1.6.1.bb3
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.2.2.bb4
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb2
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.9.1.bb5
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc2
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb2
-rw-r--r--meta/recipes-extended/screen/screen_4.4.0.bb2
-rw-r--r--meta/recipes-extended/shadow/shadow.inc2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.18p1.bb2
-rw-r--r--meta/recipes-extended/wget/wget.inc2
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc4
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc6
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc2
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb2
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb9
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb7
-rw-r--r--meta/recipes-graphics/libva/libva_1.7.3.bb3
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc3
-rw-r--r--meta/recipes-graphics/pango/pango_1.40.3.bb2
-rw-r--r--meta/recipes-graphics/wayland/weston_1.11.1.bb6
-rw-r--r--meta/recipes-graphics/xorg-app/xauth_1.0.10.bb2
-rw-r--r--meta/recipes-graphics/xorg-app/xhost_1.0.7.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libice_1.0.9.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
-rw-r--r--meta/recipes-kernel/latencytop/latencytop_0.5.bb2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc5
-rw-r--r--meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb2
-rw-r--r--meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb2
-rw-r--r--meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb9
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc4
-rw-r--r--meta/recipes-support/apr/apr_1.5.2.bb2
-rw-r--r--meta/recipes-support/boost/boost.inc4
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb3
-rw-r--r--meta/recipes-support/curl/curl_7.52.1.bb2
-rw-r--r--meta/recipes-support/libcap/libcap_2.25.bb2
-rw-r--r--meta/recipes-support/nspr/nspr_4.13.1.bb2
81 files changed, 97 insertions, 137 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 82557a8ede..8d8443ca84 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -36,7 +36,7 @@ TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
36TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged" 36TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
37 37
38RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}" 38RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
39SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 39SYSTEMDSUITE = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
40MINTESTSUITE = "ping" 40MINTESTSUITE = "ping"
41NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}" 41NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
42DEVTESTSUITE = "gcc kernelmodule ldd" 42DEVTESTSUITE = "gcc kernelmodule ldd"
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index ec3af0af92..2f625119cb 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -17,7 +17,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'o32', ' -mabi=32', '', d)
17 17
18TUNEVALID[n32] = "MIPS64 n32 ABI" 18TUNEVALID[n32] = "MIPS64 n32 ABI"
19TUNECONFLICTS[n32] = "o32 n64" 19TUNECONFLICTS[n32] = "o32 n64"
20ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'n32', '' ,d)}" 20ABIEXTENSION .= "${@bb.utils.filter('TUNE_FEATURES', 'n32' ,d)}"
21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}" 21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}"
22 22
23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture" 23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture"
@@ -44,7 +44,7 @@ MIPSPKGSFX_BYTE = "${@bb.utils.contains('TUNE_FEATURES', 'n64' , '64', '', d)}"
44MIPSPKGSFX_BYTE .= "${@bb.utils.contains('TUNE_FEATURES', 'n32' , '64', '', d)}" 44MIPSPKGSFX_BYTE .= "${@bb.utils.contains('TUNE_FEATURES', 'n32' , '64', '', d)}"
45MIPSPKGSFX_FPU = "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard' , '', '-nf', d)}" 45MIPSPKGSFX_FPU = "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard' , '', '-nf', d)}"
46MIPSPKGSFX_ABI = "${@bb.utils.contains('TUNE_FEATURES', 'n32', '-n32', '', d)}" 46MIPSPKGSFX_ABI = "${@bb.utils.contains('TUNE_FEATURES', 'n32', '-n32', '', d)}"
47MIPSPKGSFX_R6 = "${@bb.utils.contains('TUNE_FEATURES', 'r6', 'r6', '', d)}" 47MIPSPKGSFX_R6 = "${@bb.utils.filter('TUNE_FEATURES', 'r6', d)}"
48MIPSPKGSFX_64R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', 'isa', '', d)}" 48MIPSPKGSFX_64R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', 'isa', '', d)}"
49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}" 49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}"
50 50
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 96073d2d0b..89ec3f38a7 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -11,7 +11,7 @@ TARGET_FPU .= "${@bb.utils.contains('TUNE_FEATURES', [ 'ppce500' , 'spe' ], 'ppc
11 11
12# spe is defined potentially in two places, so we want to be sure it will 12# spe is defined potentially in two places, so we want to be sure it will
13# only write spe once to the ABIEXTENSIONS field. 13# only write spe once to the ABIEXTENSIONS field.
14SPEABIEXTENSION = "${@bb.utils.contains('TUNE_FEATURES', 'spe', 'spe', '', d)}" 14SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}" 15ABIEXTENSION .= "${SPEABIEXTENSION}"
16 16
17AVAILTUNES += "ppce500" 17AVAILTUNES += "ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 20a5f25b62..3a006e2cae 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -11,7 +11,7 @@ TARGET_FPU .= "${@bb.utils.contains('TUNE_FEATURES', [ 'ppce500v2' , 'spe' ], 'p
11 11
12# spe is defined potentially in two places, so we want to be sure it will 12# spe is defined potentially in two places, so we want to be sure it will
13# only write spe once to the ABIEXTENSIONS field. 13# only write spe once to the ABIEXTENSIONS field.
14SPEABIEXTENSION = "${@bb.utils.contains('TUNE_FEATURES', 'spe', 'spe', '', d)}" 14SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}" 15ABIEXTENSION .= "${SPEABIEXTENSION}"
16 16
17AVAILTUNES += "ppce500v2" 17AVAILTUNES += "ppce500v2"
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 4a55fd6b4a..c2bcf99840 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -64,7 +64,7 @@ UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf"
64UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" 64UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}"
65 65
66do_compile () { 66do_compile () {
67 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 67 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
68 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk 68 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk
69 fi 69 fi
70 70
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7fa9a7b93c..64a5418c63 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -31,10 +31,8 @@ EXTRA_OECONF += "\
31" 31"
32 32
33PACKAGECONFIG ??= "wispr \ 33PACKAGECONFIG ??= "wispr \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ 34 ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
37 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
38" 36"
39 37
40# If you want ConnMan to support VPN, add following statement into 38# If you want ConnMan to support VPN, add following statement into
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 4453a9e2ae..6635779247 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--with-pcap=linux"
22EXTRA_AUTORECONF += "--exclude=aclocal" 22EXTRA_AUTORECONF += "--exclude=aclocal"
23 23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 25 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
26" 26"
27PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" 27PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
28# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. 28# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb
index 5433dc3c3e..d6157a8965 100644
--- a/meta/recipes-connectivity/neard/neard_0.16.bb
+++ b/meta/recipes-connectivity/neard/neard_0.16.bb
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
19 19
20inherit autotools pkgconfig systemd update-rc.d bluetooth 20inherit autotools pkgconfig systemd update-rc.d bluetooth
21 21
22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
23 23
24PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" 24PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
25 25
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index 4a45accaa9..4ca9ab2a3d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -63,7 +63,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
63 " 63 "
64 64
65PACKAGECONFIG ??= "tcp-wrappers \ 65PACKAGECONFIG ??= "tcp-wrappers \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 66 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
67" 67"
68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" 68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" 69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 9c47c6fde5..676a0c0042 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -13,7 +13,7 @@ INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_PARAMS = "defaults 22"
14 14
15PACKAGECONFIG ??= "\ 15PACKAGECONFIG ??= "\
16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 16 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
18 " 18 "
19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
diff --git a/meta/recipes-connectivity/openssh/openssh_7.4p1.bb b/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
index 3b3d667a68..c8093d4e2b 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
@@ -91,12 +91,12 @@ do_compile_ptest() {
91} 91}
92 92
93do_install_append () { 93do_install_append () {
94 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 94 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
95 install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 95 install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
96 sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config 96 sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config
97 fi 97 fi
98 98
99 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then 99 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
100 sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config 100 sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config
101 fi 101 fi
102 102
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index fc55925615..0b7991d1fd 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -37,7 +37,7 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
37FILES_libssl = "${libdir}/libssl${SOLIBS}" 37FILES_libssl = "${libdir}/libssl${SOLIBS}"
38FILES_${PN} =+ " ${libdir}/ssl/*" 38FILES_${PN} =+ " ${libdir}/ssl/*"
39FILES_${PN}-misc = "${libdir}/ssl/misc" 39FILES_${PN}-misc = "${libdir}/ssl/misc"
40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 40RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
41 41
42# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 42# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
43# package RRECOMMENDS on this package. This will enable the configuration 43# package RRECOMMENDS on this package. This will enable the configuration
@@ -185,7 +185,7 @@ do_install () {
185 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash 185 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
186 186
187 oe_multilib_header openssl/opensslconf.h 187 oe_multilib_header openssl/opensslconf.h
188 if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then 188 if [ "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" ]; then
189 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 189 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
190 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget 190 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
191 else 191 else
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 9bfbeabc04..821aafc6e0 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -36,7 +36,7 @@ EXTRA_OECONF += "ac_cv_func_getgroups_works=yes \
36 36
37# acl is not a default feature 37# acl is not a default feature
38# 38#
39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 39PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}"
40 40
41# with, without, depends, rdepends 41# with, without, depends, rdepends
42# 42#
diff --git a/meta/recipes-core/coreutils/coreutils_8.26.bb b/meta/recipes-core/coreutils/coreutils_8.26.bb
index caa6d96e25..52ef1013ca 100644
--- a/meta/recipes-core/coreutils/coreutils_8.26.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.26.bb
@@ -35,8 +35,7 @@ EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch"
35# acl and xattr are not default features 35# acl and xattr are not default features
36# 36#
37PACKAGECONFIG_class-target ??= "\ 37PACKAGECONFIG_class-target ??= "\
38 ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ 38 ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \
40" 39"
41 40
42# The lib/oe/path.py requires xattr 41# The lib/oe/path.py requires xattr
diff --git a/meta/recipes-core/dbus/dbus_1.10.14.bb b/meta/recipes-core/dbus/dbus_1.10.14.bb
index d74560246e..6354572b84 100644
--- a/meta/recipes-core/dbus/dbus_1.10.14.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.14.bb
@@ -100,9 +100,7 @@ EXTRA_OECONF = "--disable-tests \
100EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" 100EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
101EXTRA_OECONF_append_class-native = " --disable-selinux" 101EXTRA_OECONF_append_class-native = " --disable-selinux"
102 102
103PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 103PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile systemd x11', d)}"
104 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \
105 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
106PACKAGECONFIG_class-native = "" 104PACKAGECONFIG_class-native = ""
107PACKAGECONFIG_class-nativesdk = "" 105PACKAGECONFIG_class-nativesdk = ""
108 106
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index bda7eb847c..b6b436c584 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -8,7 +8,7 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01"
9 9
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11RPROVIDES_${PN} = "ssh sshd" 11RPROVIDES_${PN} = "ssh sshd"
12 12
13DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
@@ -63,7 +63,7 @@ do_install() {
63 63
64 install -m 0755 dropbearmulti ${D}${sbindir}/ 64 install -m 0755 dropbearmulti ${D}${sbindir}/
65 ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient 65 ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
66 66
67 for i in ${SBINCOMMANDS} 67 for i in ${SBINCOMMANDS}
68 do 68 do
69 ln -s ./dropbearmulti ${D}${sbindir}/$i 69 ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -74,7 +74,7 @@ do_install() {
74 -e 's,/usr/bin,${bindir},g' \ 74 -e 's,/usr/bin,${bindir},g' \
75 -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear 75 -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear
76 chmod 755 ${D}${sysconfdir}/init.d/dropbear 76 chmod 755 ${D}${sysconfdir}/init.d/dropbear
77 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 77 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
78 install -d ${D}${sysconfdir}/pam.d 78 install -d ${D}${sysconfdir}/pam.d
79 install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ 79 install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
80 fi 80 fi
diff --git a/meta/recipes-core/kbd/kbd_2.0.3.bb b/meta/recipes-core/kbd/kbd_2.0.3.bb
index 54d16835fc..fbc558febd 100644
--- a/meta/recipes-core/kbd/kbd_2.0.3.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.3.bb
@@ -18,7 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
18SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208" 18SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208"
19SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e" 19SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e"
20 20
21PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 21PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
22PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," 22PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
23 23
24do_compile_ptest() { 24do_compile_ptest() {
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 93b9ba01da..023fe9956d 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -43,7 +43,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm
43export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" 43export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
44 44
45PACKAGECONFIG ??= "python \ 45PACKAGECONFIG ??= "python \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 46 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
47" 47"
48PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" 48PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python"
49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index cc8781e476..9ec8378a30 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -41,11 +41,9 @@ SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-t
41 41
42PACKAGECONFIG ??= "xz \ 42PACKAGECONFIG ??= "xz \
43 ldconfig \ 43 ldconfig \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 44 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux', d)} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 46 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
48 ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'efi', '', d)} \
49 binfmt \ 47 binfmt \
50 randomseed \ 48 randomseed \
51 machined \ 49 machined \
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 7d948bfda6..821f7c8751 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -52,7 +52,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \
52 52
53EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" 53EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
54 54
55PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 55PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
56PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," 56PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
57 57
58# Respect the systemd feature for uuidd 58# Respect the systemd feature for uuidd
@@ -177,7 +177,7 @@ do_install () {
177 177
178 rm -f ${D}${bindir}/chkdupexe 178 rm -f ${D}${bindir}/chkdupexe
179 179
180 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 180 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
181 install -d ${D}${sysconfdir}/pam.d 181 install -d ${D}${sysconfdir}/pam.d
182 install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser 182 install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
183 install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l 183 install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
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 = "\
10 " 10 "
11 11
12do_configure_prepend() { 12do_configure_prepend() {
13 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then 13 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
14 cat > ${WORKDIR}/python << EOF 14 cat > ${WORKDIR}/python << EOF
15#!/bin/sh 15#!/bin/sh
16case "\$2" in 16case "\$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/"
26# xattr support creates an additional compile-time dependency on acl because 26# xattr support creates an additional compile-time dependency on acl because
27# the sys/acl.h header is needed. libacl is not needed and thus enabling xattr 27# the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
28# regardless whether acl is enabled or disabled in the distro should be okay. 28# regardless whether acl is enabled or disabled in the distro should be okay.
29PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" 29PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
30PACKAGECONFIG[xattr] = ",,acl," 30PACKAGECONFIG[xattr] = ",,acl,"
31 31
32EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" 32EXTRA_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"
10 10
11acpaths = "-I ${S}/m4 " 11acpaths = "-I ${S}/m4 "
12 12
13PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" 13PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
14PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," 14PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
15 15
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"
29 29
30inherit autotools pkgconfig 30inherit autotools pkgconfig
31 31
32PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ 32PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \
33" 33"
34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" 34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
35PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" 35PACKAGECONFIG[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() {
81 # Disable zypper channel support 81 # Disable zypper channel support
82 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/zyppchannelsync.py* 82 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/zyppchannelsync.py*
83 83
84 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then 84 if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'rpm', d)}" ]; then
85 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/rpmdir.py* 85 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/rpmdir.py*
86 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/backends/rpm 86 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/backends/rpm
87 fi 87 fi
88 88
89 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then 89 if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'qt4', d)}" ]; then
90 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/interfaces/qt4 90 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/interfaces/qt4
91 fi 91 fi
92 92
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() {
100 100
101PACKAGECONFIG ??= " \ 101PACKAGECONFIG ??= " \
102 fdt sdl \ 102 fdt sdl \
103 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 103 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
104 ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen', '', d)} \
105 " 104 "
106PACKAGECONFIG_class-native ??= "fdt alsa uuid" 105PACKAGECONFIG_class-native ??= "fdt alsa uuid"
107PACKAGECONFIG_class-nativesdk ??= "fdt sdl" 106PACKAGECONFIG_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"
12 12
13PR = "r4" 13PR = "r4"
14 14
15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 15PACKAGECONFIG ??= "${@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+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11 11
12PACKAGECONFIG ??= "acl attr \ 12PACKAGECONFIG ??= "acl attr \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 13 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
14" 14"
15PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," 15PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
16PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," 16PACKAGECONFIG[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
9UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" 9UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
10 10
11PACKAGECONFIG ??= "" 11PACKAGECONFIG ??= ""
12PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 12PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
13 13
14PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" 14PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
15PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" 15PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"
diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.20.bb
index 85459b6403..904899f1c7 100644
--- a/meta/recipes-extended/at/at_3.1.20.bb
+++ b/meta/recipes-extended/at/at_3.1.20.bb
@@ -65,7 +65,7 @@ do_install () {
65 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system 65 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
66 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service 66 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service
67 67
68 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 68 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
69 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 69 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
70 fi 70 fi
71} 71}
diff --git a/meta/recipes-extended/cronie/cronie_1.5.1.bb b/meta/recipes-extended/cronie/cronie_1.5.1.bb
index 99b2bb5c83..ad616d5c60 100644
--- a/meta/recipes-extended/cronie/cronie_1.5.1.bb
+++ b/meta/recipes-extended/cronie/cronie_1.5.1.bb
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "6c73666102a6b5d35e2eaf1bd06925f2d4b0cef8d3323c37286dda3089
28 28
29inherit autotools update-rc.d useradd systemd 29inherit autotools update-rc.d useradd systemd
30 30
31PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 31PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
32 32
33PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," 33PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
34PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" 34PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}"
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index e69f178cf2..c3fa45941c 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -24,8 +24,7 @@ GROUPADD_PARAM_${PN} = "--system lpadmin"
24SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket org.cups.cups-lpd@.service" 24SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket org.cups.cups-lpd@.service"
25 25
26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
28 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
29PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" 28PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
30PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 29PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
31PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" 30PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
diff --git a/meta/recipes-extended/iptables/iptables_1.6.1.bb b/meta/recipes-extended/iptables/iptables_1.6.1.bb
index 9b4c05095a..4019e2a4a4 100644
--- a/meta/recipes-extended/iptables/iptables_1.6.1.bb
+++ b/meta/recipes-extended/iptables/iptables_1.6.1.bb
@@ -32,8 +32,7 @@ inherit autotools pkgconfig
32 32
33EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ 33EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
34 " 34 "
35PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 35PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
36 "
37 36
38PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 37PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
39 38
diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
index a7ec621fb9..5e9c1184b6 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
@@ -11,9 +11,7 @@ PACKAGECONFIG ?= "zlib bz2"
11 11
12PACKAGECONFIG_append_class-target = "\ 12PACKAGECONFIG_append_class-target = "\
13 libxml2 \ 13 libxml2 \
14 ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ 14 ${@bb.utils.filter('DISTRO_FEATURES', 'acl largefile xattr', d)} \
15 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \
16 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \
17" 15"
18 16
19PACKAGECONFIG_append_class-nativesdk = " largefile" 17PACKAGECONFIG_append_class-nativesdk = " largefile"
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
index c82d93b8a2..55218518fa 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
@@ -24,7 +24,7 @@ SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631"
24SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f" 24SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f"
25 25
26PACKAGECONFIG ??= "openssl pcre zlib \ 26PACKAGECONFIG ??= "openssl pcre zlib \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
30" 30"
diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
index 5f1a601aeb..9c2dfe0a13 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
@@ -19,10 +19,7 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
19SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0" 19SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0"
20SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545" 20SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545"
21 21
22PACKAGECONFIG ?= "\ 22PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
23 ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
25"
26 23
27PACKAGECONFIG[acl] = ",,acl" 24PACKAGECONFIG[acl] = ",,acl"
28PACKAGECONFIG[selinux] = ",,libselinux" 25PACKAGECONFIG[selinux] = ",,libselinux"
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 98a84709a1..22b2e850a3 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -15,7 +15,7 @@ S = "${WORKDIR}/psmisc-${PV}"
15 15
16inherit autotools gettext 16inherit autotools gettext
17 17
18PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 18PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
19PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 19PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
20 20
21ALLOW_EMPTY_${PN} = "1" 21ALLOW_EMPTY_${PN} = "1"
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
index 53cd59d833..4911fe51e8 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
@@ -43,7 +43,7 @@ USERADD_PACKAGES = "${PN}"
43USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \ 43USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \
44 --shell /bin/false --user-group rpc" 44 --shell /bin/false --user-group rpc"
45 45
46PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 46PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
47PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \ 47PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \
48 --without-systemdsystemunitdir, \ 48 --without-systemdsystemunitdir, \
49 systemd \ 49 systemd \
diff --git a/meta/recipes-extended/screen/screen_4.4.0.bb b/meta/recipes-extended/screen/screen_4.4.0.bb
index 769bac162b..f2c57b5370 100644
--- a/meta/recipes-extended/screen/screen_4.4.0.bb
+++ b/meta/recipes-extended/screen/screen_4.4.0.bb
@@ -38,7 +38,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
38 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 38 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
39 39
40do_install_append () { 40do_install_append () {
41 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 41 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
42 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen 42 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
43 fi 43 fi
44} 44}
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 4c4db0013f..99ffac35d1 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -74,7 +74,7 @@ PAM_PLUGINS = "libpam-runtime \
74 pam-plugin-shells \ 74 pam-plugin-shells \
75 pam-plugin-rootok" 75 pam-plugin-rootok"
76 76
77PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 77PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
78PACKAGECONFIG_class-native = "" 78PACKAGECONFIG_class-native = ""
79PACKAGECONFIG_class-nativesdk = "" 79PACKAGECONFIG_class-nativesdk = ""
80PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" 80PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}"
diff --git a/meta/recipes-extended/sudo/sudo_1.8.18p1.bb b/meta/recipes-extended/sudo/sudo_1.8.18p1.bb
index 95e1b84d2b..be6b469e48 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.18p1.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.18p1.bb
@@ -20,7 +20,7 @@ EXTRA_OECONF += " \
20 " 20 "
21 21
22do_install_append () { 22do_install_append () {
23 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 23 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
24 install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo 24 install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
25 fi 25 fi
26 26
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 3b223a3df8..9eb051ff6a 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -18,7 +18,7 @@ RRECOMMENDS_${PN} += "ca-certificates"
18 18
19BBCLASSEXTEND += "nativesdk" 19BBCLASSEXTEND += "nativesdk"
20 20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
22PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" 22PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux"
23PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 23PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
24 24
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
index 98e5090bc8..a188f5473b 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
@@ -29,7 +29,7 @@ LIBV = "2.10.0"
29GDK_PIXBUF_LOADERS ?= "png jpeg" 29GDK_PIXBUF_LOADERS ?= "png jpeg"
30 30
31PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" 31PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}"
32PACKAGECONFIG_linuxstdbase = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" 32PACKAGECONFIG_linuxstdbase = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${GDK_PIXBUF_LOADERS}"
33PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" 33PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
34 34
35PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" 35PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng"
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index b9b4721780..558bc485ad 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -21,9 +21,7 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
21DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \ 21DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \
22 cairo gdk-pixbuf" 22 cairo gdk-pixbuf"
23 23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb x11', d)}"
25 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
26"
27 25
28PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" 26PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
29# without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE 27# without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 9c104e28c0..27da844fea 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -40,10 +40,8 @@ do_compile_prepend() {
40 export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" 40 export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs"
41} 41}
42 42
43PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ 43PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
44 ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl", "", d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
45 ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \
46 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
47 45
48PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" 46PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
49# this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build 47# this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 597b58290a..8e1e2e1b88 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -22,7 +22,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
22DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" 22DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
23 23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ 24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 25 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"
26 26
27PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" 27PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
28PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" 28PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index c6ecd0804c..6dbbf4d803 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -35,7 +35,7 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla
35 35
36# Default configuration, distros might want to override 36# Default configuration, distros might want to override
37PACKAGECONFIG ??= "egl \ 37PACKAGECONFIG ??= "egl \
38 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 38 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" 39 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
40 40
41FILES_${PN}-examples = "${libdir}/clutter/examples" 41FILES_${PN}-examples = "${libdir}/clutter/examples"
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
index 4d52f126ff..bd0148e3e7 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
@@ -16,4 +16,4 @@ REQUIRED_DISTRO_FEATURES = "opengl"
16DEPENDS = "util-macros virtual/egl" 16DEPENDS = "util-macros virtual/egl"
17 17
18PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" 18PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11"
19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 9c0ec541e3..c802a6f692 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -41,13 +41,10 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
41 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ 41 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
42 --disable-rpath" 42 --disable-rpath"
43 43
44PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 44PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
46 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
49PACKAGECONFIG_class-native = "x11" 46PACKAGECONFIG_class-native = "x11"
50PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 47PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
51 48
52PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" 49PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
53PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" 50PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index 0d9a12993f..d747cf18f0 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -38,15 +38,12 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
38 38
39# opengl packageconfig factored out to make it easy for distros 39# opengl packageconfig factored out to make it easy for distros
40# and BSP layers to pick either (desktop) opengl, gles2, or no GL 40# and BSP layers to pick either (desktop) opengl, gles2, or no GL
41PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" 41PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
42 42
43PACKAGECONFIG ??= " \ 43PACKAGECONFIG ??= " \
44 ${PACKAGECONFIG_GL} \ 44 ${PACKAGECONFIG_GL} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 45 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ 46 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \
49 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
50" 47"
51PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," 48PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
52PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" 49PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb"
diff --git a/meta/recipes-graphics/libva/libva_1.7.3.bb b/meta/recipes-graphics/libva/libva_1.7.3.bb
index 5c74fa628b..627b39a90f 100644
--- a/meta/recipes-graphics/libva/libva_1.7.3.bb
+++ b/meta/recipes-graphics/libva/libva_1.7.3.bb
@@ -32,8 +32,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
32 32
33EXTRA_OECONF = "--disable-dummy-driver" 33EXTRA_OECONF = "--disable-dummy-driver"
34 34
35PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ 35PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
36 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
37PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" 36PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes"
38PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" 37PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland"
39 38
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
index fab0bdb2ee..e80d1e8acb 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
30 x11 glew glu glx" 30 x11 glew glu glx"
31 31
32# The Wayland code doesn't work with Wayland 1.0, so disable it for now 32# The Wayland code doesn't work with Wayland 1.0, so disable it for now
33#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 33#${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
34 34
35EXTRA_OECONF = "--with-system-data-files" 35EXTRA_OECONF = "--with-system-data-files"
36 36
diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
index f06a3e9b58..85cc396fe3 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
@@ -8,6 +8,6 @@ PROVIDES = "virtual/libgl virtual/mesa"
8 8
9S = "${WORKDIR}/mesa-${PV}" 9S = "${WORKDIR}/mesa-${PV}"
10 10
11PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 11PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
12 12
13EXCLUDE_FROM_WORLD = "1" 13EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 5d882b1001..87c6821e65 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -25,8 +25,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
25EXTRA_OECONF = "--enable-shared-glapi" 25EXTRA_OECONF = "--enable-shared-glapi"
26 26
27PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ 27PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ 28 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
30 " 29 "
31 30
32PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" 31PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
diff --git a/meta/recipes-graphics/pango/pango_1.40.3.bb b/meta/recipes-graphics/pango/pango_1.40.3.bb
index 338ef4a910..e259a820c2 100644
--- a/meta/recipes-graphics/pango/pango_1.40.3.bb
+++ b/meta/recipes-graphics/pango/pango_1.40.3.bb
@@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded9
22 22
23DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" 23DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
24 24
25PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
26PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" 26PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
27 27
28EXTRA_AUTORECONF = "" 28EXTRA_AUTORECONF = ""
diff --git a/meta/recipes-graphics/wayland/weston_1.11.1.bb b/meta/recipes-graphics/wayland/weston_1.11.1.bb
index cdfac70ed1..22b30ad2d3 100644
--- a/meta/recipes-graphics/wayland/weston_1.11.1.bb
+++ b/meta/recipes-graphics/wayland/weston_1.11.1.bb
@@ -37,10 +37,8 @@ EXTRA_OECONF_append_qemux86-64 = "\
37 WESTON_NATIVE_BACKEND=fbdev-backend.so \ 37 WESTON_NATIVE_BACKEND=fbdev-backend.so \
38 " 38 "
39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
42 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 41 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
43 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
44 clients launch" 42 clients launch"
45# 43#
46# Compositor choices 44# Compositor choices
@@ -85,7 +83,7 @@ do_install_append() {
85 rm -f ${D}/${libdir}/weston/*.la 83 rm -f ${D}/${libdir}/weston/*.la
86 84
87 # If X11, ship a desktop file to launch it 85 # If X11, ship a desktop file to launch it
88 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then 86 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
89 install -d ${D}${datadir}/applications 87 install -d ${D}${datadir}/applications
90 install ${WORKDIR}/weston.desktop ${D}${datadir}/applications 88 install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
91 89
diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
index 26e02a9e57..0e90ffd67b 100644
--- a/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
+++ b/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
@@ -11,5 +11,5 @@ PE = "1"
11SRC_URI[md5sum] = "f3f76cb10f69b571c43893ea6a634aa4" 11SRC_URI[md5sum] = "f3f76cb10f69b571c43893ea6a634aa4"
12SRC_URI[sha256sum] = "5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d" 12SRC_URI[sha256sum] = "5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d"
13 13
14PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 14PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
15PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 15PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
index f23d258e0b..77490f5488 100644
--- a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
+++ b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
@@ -16,5 +16,5 @@ PE = "1"
16SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" 16SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516"
17SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" 17SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a"
18 18
19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
20PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 20PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
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"
23SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" 23SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726"
24SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" 24SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202"
25 25
26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
27PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" 27PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
28PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 28PACKAGECONFIG[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"
27SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" 27SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3"
28SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" 28SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd"
29 29
30PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 30PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 31PACKAGECONFIG[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"
18SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5" 18SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5"
19SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e" 19SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e"
20 20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
22PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 22PACKAGECONFIG[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"
21SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79" 21SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79"
22SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71" 22SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71"
23 23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
25PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 25PACKAGECONFIG[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
18 18
19EXTRA_OECONF = "--disable-docs" 19EXTRA_OECONF = "--disable-docs"
20 20
21PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 21PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
22PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," 22PACKAGECONFIG[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"
31SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" 31SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4"
32SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" 32SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b"
33 33
34PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 34PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
35PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 35PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 7717802006..1650c7994c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,8 +123,8 @@ EXTRA_OECONF += "--with-fop=no \
123OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" 123OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
124PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ 124PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
125 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ 125 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
126 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ 126 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xwayland', '', d)} \
127 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ 127 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
128" 128"
129 129
130PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 130PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index c38a038f61..eb19471ce8 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/73bb3371c
19SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c" 19SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
20SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef" 20SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
21 21
22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
23 23
24PACKAGECONFIG[x11] = ",,gtk+" 24PACKAGECONFIG[x11] = ",,gtk+"
25 25
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
index c95ea54160..3928fb1cb9 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
@@ -31,7 +31,7 @@ inherit autotools pkgconfig
31PACKAGECONFIG ??= "\ 31PACKAGECONFIG ??= "\
32 samplerate \ 32 samplerate \
33 speexdsp \ 33 speexdsp \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 34 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
35" 35"
36PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" 36PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav"
37PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 37PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 3cb7ab1ae1..992373b69e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG ??= " \
20 ${GSTREAMER_ORC} \ 20 ${GSTREAMER_ORC} \
21 ${PACKAGECONFIG_GL} \ 21 ${PACKAGECONFIG_GL} \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 23 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
25 bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ 25 bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \
26" 26"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 1c5620017a..08130c1da4 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -17,8 +17,7 @@ PACKAGES_DYNAMIC =+ "^libgst.*"
17 17
18PACKAGECONFIG ??= " \ 18PACKAGECONFIG ??= " \
19 ${GSTREAMER_ORC} \ 19 ${GSTREAMER_ORC} \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 20 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
22 gio-unix-2.0 ogg pango theora vorbis \ 21 gio-unix-2.0 ogg pango theora vorbis \
23" 22"
24 23
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index f1e30aba55..14c3d61848 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -8,8 +8,7 @@ inherit gettext
8 8
9PACKAGECONFIG ??= " \ 9PACKAGECONFIG ??= " \
10 ${GSTREAMER_ORC} \ 10 ${GSTREAMER_ORC} \
11 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 11 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
12 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ 12 cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \
14" 13"
15 14
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
index c73ecf8efe..ef0734ba93 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
@@ -23,9 +23,8 @@ REQUIRED_DISTRO_FEATURES ?= "opengl"
23PACKAGES =+ "${PN}-tests" 23PACKAGES =+ "${PN}-tests"
24 24
25PACKAGECONFIG ??= "drm \ 25PACKAGECONFIG ??= "drm \
26 ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \
27 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
28 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
29 28
30PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" 29PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm"
31PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" 30PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa"
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb
index ec41719439..7a095b6a11 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
14 14
15S = "${WORKDIR}/libsndfile-${PV}" 15S = "${WORKDIR}/libsndfile-${PV}"
16 16
17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 17PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}"
18PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 18PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
19 19
20inherit autotools lib_package pkgconfig 20inherit autotools lib_package pkgconfig
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index 16669947f9..fe765da193 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--enable-shared --disable-sdl" 21EXTRA_OECONF = "--enable-shared --disable-sdl"
22 22
23PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 23PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
24PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" 24PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
25 25
26PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" 26PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb b/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb
index f4c5c7cce8..e0a70380ea 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig
20# The options should be mutually exclusive for configuration script. 20# The options should be mutually exclusive for configuration script.
21# If both alsa and pulseaudio are specified (as in the default distro features) 21# If both alsa and pulseaudio are specified (as in the default distro features)
22# pulseaudio takes precedence. 22# pulseaudio takes precedence.
23PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 23PACKAGECONFIG_ALSA = "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}"
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" 24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}"
25 25
26PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" 26PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib"
@@ -33,13 +33,8 @@ PACKAGECONFIG[sdl] = ",,libsdl"
33 33
34# Following are possible sound output modules: 34# Following are possible sound output modules:
35# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi 35# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi
36AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" 36AUDIOMODS += "${@bb.utils.filter('PACKAGECONFIG', 'alsa esd jack openal portaudio sdl', d)}"
37AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}"
38AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}"
39AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}"
40AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}"
41AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" 37AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}"
42AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}"
43 38
44EXTRA_OECONF = " \ 39EXTRA_OECONF = " \
45 --enable-shared \ 40 --enable-shared \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 818ff560cc..fdbf5abc16 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -108,10 +108,8 @@ EXTRA_OECONF += "--disable-adrian-aec"
108 108
109PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 109PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
110 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 110 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
111 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
112 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ 111 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \
113 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 112 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \
114 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
115 dbus \ 113 dbus \
116 " 114 "
117 115
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
39# x86_64-linux-libtool: error: specify a tag with '--tag' 39# x86_64-linux-libtool: error: specify a tag with '--tag'
40CCACHE = "" 40CCACHE = ""
41 41
42PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 42PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
43PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 43PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
44 44
45do_configure_prepend() { 45do_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"
45PACKAGECONFIG[python] = ",,python python3" 45PACKAGECONFIG[python] = ",,python python3"
46 46
47BOOST_LIBS += "\ 47BOOST_LIBS += "\
48 ${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \ 48 ${@bb.utils.filter('PACKAGECONFIG', 'locale', d)} \
49 ${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \
50 bb.utils.contains('PACKAGECONFIG', 'mpi', 'mpi', '', d), d)} \ 50 bb.utils.filter('PACKAGECONFIG', 'mpi', d), d)} \
51 ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \ 51 ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \
52" 52"
53 53
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
23 23
24S = "${WORKDIR}/ConsoleKit-${PV}" 24S = "${WORKDIR}/ConsoleKit-${PV}"
25 25
26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
27 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
28 27
29PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 28PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
30PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit" 29PACKAGECONFIG[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
20CVE_PRODUCT = "libcurl" 20CVE_PRODUCT = "libcurl"
21inherit autotools pkgconfig binconfig multilib_header 21inherit autotools pkgconfig binconfig multilib_header
22 22
23PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls proxy zlib" 23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy zlib"
24PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib" 24PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib"
25PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl zlib" 25PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl zlib"
26 26
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() {
27 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile 27 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile
28} 28}
29 29
30PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 30PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
31 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" 31 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}"
32PACKAGECONFIG_class-native ??= "" 32PACKAGECONFIG_class-native ??= ""
33 33
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 = " \
147 147
148inherit autotools 148inherit autotools
149 149
150PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 150PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
151PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 151PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
152 152
153do_compile_prepend() { 153do_compile_prepend() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:04:18 +0000