diff options
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 7 |
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 | ||
10 | DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt" | 10 | DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt" |
11 | 11 | ||
12 | inherit gnomebase gettext systemd | 12 | inherit gnomebase gettext systemd |
13 | 13 | ||
@@ -33,6 +33,7 @@ EXTRA_OECONF = " \ | |||
33 | 33 | ||
34 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ | 34 | PACKAGECONFIG ??= "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 | " |
37 | PACKAGECONFIG[systemd] = " \ | 38 | PACKAGECONFIG[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 | |||
50 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" | 51 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" |
51 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 52 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
52 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" | 53 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" |
54 | PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" | ||
53 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" | 55 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" |
54 | PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" | 56 | PACKAGECONFIG[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 | " |
75 | RCONFLICTS_${PN} = "connman" | 77 | RCONFLICTS_${PN} = "connman" |
76 | RDEPENDS_${PN} = " \ | ||
77 | wpa-supplicant \ | ||
78 | " | ||
79 | 78 | ||
80 | FILES_${PN}-dbg += " \ | 79 | FILES_${PN}-dbg += " \ |
81 | ${libdir}/NetworkManager/.debug/ \ | 80 | ${libdir}/NetworkManager/.debug/ \ |