summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb7
1 files changed, 3 insertions, 4 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 e8fe9604d7..9283e320af 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
7 file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \ 7 file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \
8" 8"
9 9
10DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt" 10DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt"
11 11
12inherit gnomebase gettext systemd 12inherit gnomebase gettext systemd
13 13
@@ -33,6 +33,7 @@ EXTRA_OECONF = " \
33 33
34PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ 34PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
35 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
36" 37"
37PACKAGECONFIG[systemd] = " \ 38PACKAGECONFIG[systemd] = " \
38 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ 39 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
@@ -50,6 +51,7 @@ PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-clien
50PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" 51PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
51PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" 52PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
52PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" 53PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt"
54PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
53PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" 55PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
54PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" 56PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
55 57
@@ -73,9 +75,6 @@ RRECOMMENDS_${PN} += "iptables \
73 ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ 75 ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
74" 76"
75RCONFLICTS_${PN} = "connman" 77RCONFLICTS_${PN} = "connman"
76RDEPENDS_${PN} = " \
77 wpa-supplicant \
78"
79 78
80FILES_${PN}-dbg += " \ 79FILES_${PN}-dbg += " \
81 ${libdir}/NetworkManager/.debug/ \ 80 ${libdir}/NetworkManager/.debug/ \