diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-01 18:30:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-07 13:30:26 +0100 |
commit | 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch) | |
tree | 362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-oe/recipes-connectivity | |
parent | b4524eb786472e69e28212a58a329a5e44e40547 (diff) | |
download | meta-openembedded-contrib-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz |
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
4 files changed, 7 insertions, 11 deletions
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc index 59c35e4733..5240ccfd8b 100644 --- a/meta-oe/recipes-connectivity/bluez/bluez4.inc +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc @@ -15,11 +15,7 @@ RCONFLICTS_${PN} += "${PN}-systemd" DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1" RDEPENDS_${PN}-dev = "bluez-hcidump" -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ - ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ -" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb index 1d367ada22..b22f820d57 100644 --- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" DEPENDS = "glib-2.0 intltool-native" X11DEPENDS = " libxpm gtk+" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb index 5e4e220821..e60cd4b741 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf79261 S = "${WORKDIR}/ModemManager-${PV}" PACKAGECONFIG ??= "mbim qmi polkit \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb index 90d0232921..064c58b520 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb @@ -48,9 +48,9 @@ do_compile_prepend() { } PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ " PACKAGECONFIG[systemd] = " \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ @@ -95,7 +95,7 @@ FILES_${PN} += " \ " RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ " RCONFLICTS_${PN} = "connman" |