summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/networkmanager
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-03-01 18:30:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-07 13:30:26 +0100
commit0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch)
tree362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-oe/recipes-connectivity/networkmanager
parentb4524eb786472e69e28212a58a329a5e44e40547 (diff)
downloadmeta-openembedded-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/networkmanager')
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb8
1 files changed, 4 insertions, 4 deletions
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 90d023292..064c58b52 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() {
48} 48}
49 49
50PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ 50PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
51 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ 51 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
52 ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ 52 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
53 ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ 53 ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
54" 54"
55PACKAGECONFIG[systemd] = " \ 55PACKAGECONFIG[systemd] = " \
56 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ 56 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
@@ -95,7 +95,7 @@ FILES_${PN} += " \
95" 95"
96 96
97RRECOMMENDS_${PN} += "iptables \ 97RRECOMMENDS_${PN} += "iptables \
98 ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ 98 ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \
99" 99"
100RCONFLICTS_${PN} = "connman" 100RCONFLICTS_${PN} = "connman"
101 101