summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAdrian <adrian.freihofer@gmail.com>2015-11-11 20:48:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:28:22 +0100
commit2c7e7ef5bb4a74130409ba7c57a13e9a62c8084a (patch)
treea98751b6d1a5fa0f6701c15c79e25db26e7fb1ea /meta-oe/recipes-connectivity
parentc3b2f9868dc0b3aa0d2c7b9dd0624d50dcf21c66 (diff)
downloadmeta-openembedded-2c7e7ef5bb4a74130409ba7c57a13e9a62c8084a.tar.gz
networkmanager: PACKAGECONFIG for ifupdown netconfig
Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb6
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 fd867b5ee..e159df6c0 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
22S = "${WORKDIR}/NetworkManager-${PV}" 22S = "${WORKDIR}/NetworkManager-${PV}"
23 23
24EXTRA_OECONF = " \ 24EXTRA_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
38PACKAGECONFIG ??= "nss \ 36PACKAGECONFIG ??= "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"
41PACKAGECONFIG[systemd] = " \ 39PACKAGECONFIG[systemd] = " \
@@ -51,6 +49,8 @@ PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1
51PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" 49PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
52PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" 50PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
53PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" 51PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt"
52PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
53PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
54 54
55PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc" 55PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc"
56 56