[oe] [meta-oe][PATCH 14/17] networkmanager: PACKAGECONFIG for wifi

[Adrian Freihofer]

Signed-off-by: Adrian Freihofer <adrian.freihofer at gmail.com>
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
index c00e544..590ce3b 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
-DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt"
+DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt"
 
 inherit gnomebase gettext systemd
 
@@ -48,10 +48,11 @@ EXTRA_OECONF = " \
 
 # If you need a different configuration for networkmanager, add a line similar to
 # the following examples to your local.conf or distro config
-# PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
+# PACKAGECONFIG_pn-networkmanager = "systemd gnutls wifi"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
 PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
 "
 PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
@@ -69,6 +70,7 @@ PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-clien
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
+PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
 
@@ -92,9 +94,6 @@ RRECOMMENDS_${PN} += "iptables \
     ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
 "
 RCONFLICTS_${PN} = "connman"
-RDEPENDS_${PN} = " \
-    wpa-supplicant \
-"
 
 FILES_${PN}-dbg += " \
     ${libdir}/NetworkManager/.debug/ \
-- 
2.4.3