diff options
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 6 |
1 files changed, 3 insertions, 3 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 fd867b5eeb..e159df6c0e 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | |||
@@ -22,11 +22,9 @@ SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb9264 | |||
22 | S = "${WORKDIR}/NetworkManager-${PV}" | 22 | S = "${WORKDIR}/NetworkManager-${PV}" |
23 | 23 | ||
24 | EXTRA_OECONF = " \ | 24 | EXTRA_OECONF = " \ |
25 | --enable-ifupdown \ | ||
26 | --disable-ifcfg-rh \ | 25 | --disable-ifcfg-rh \ |
27 | --disable-ifnet \ | 26 | --disable-ifnet \ |
28 | --disable-ifcfg-suse \ | 27 | --disable-ifcfg-suse \ |
29 | --with-netconfig \ | ||
30 | --disable-more-warnings \ | 28 | --disable-more-warnings \ |
31 | --with-dhclient=${base_sbindir}/dhclient \ | 29 | --with-dhclient=${base_sbindir}/dhclient \ |
32 | --with-iptables=${sbindir}/iptables \ | 30 | --with-iptables=${sbindir}/iptables \ |
@@ -35,7 +33,7 @@ EXTRA_OECONF = " \ | |||
35 | --with-nmtui=yes \ | 33 | --with-nmtui=yes \ |
36 | " | 34 | " |
37 | 35 | ||
38 | PACKAGECONFIG ??= "nss \ | 36 | PACKAGECONFIG ??= "nss ifupdown netconfig \ |
39 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ | 37 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ |
40 | " | 38 | " |
41 | PACKAGECONFIG[systemd] = " \ | 39 | PACKAGECONFIG[systemd] = " \ |
@@ -51,6 +49,8 @@ PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1 | |||
51 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" | 49 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" |
52 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 50 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
53 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" | 51 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" |
52 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" | ||
53 | PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" | ||
54 | 54 | ||
55 | PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc" | 55 | PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc" |
56 | 56 | ||