diff options
author | Adrian <adrian.freihofer@gmail.com> | 2015-11-11 20:48:15 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:28:22 +0100 |
commit | b8de598558f100eb51fe5a21394e0a4ab7024578 (patch) | |
tree | b2d1d31fc547c2ac4d2de4adfc3702bdb8aefb97 /meta-oe | |
parent | 2c7e7ef5bb4a74130409ba7c57a13e9a62c8084a (diff) | |
download | meta-openembedded-b8de598558f100eb51fe5a21394e0a4ab7024578.tar.gz |
networkmanager: PACKAGECONFIG for dhclient
Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-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 e159df6c0..c03630d4e 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | |||
@@ -26,14 +26,13 @@ EXTRA_OECONF = " \ | |||
26 | --disable-ifnet \ | 26 | --disable-ifnet \ |
27 | --disable-ifcfg-suse \ | 27 | --disable-ifcfg-suse \ |
28 | --disable-more-warnings \ | 28 | --disable-more-warnings \ |
29 | --with-dhclient=${base_sbindir}/dhclient \ | ||
30 | --with-iptables=${sbindir}/iptables \ | 29 | --with-iptables=${sbindir}/iptables \ |
31 | --with-tests \ | 30 | --with-tests \ |
32 | --with-dnsmasq=${bindir}/dnsmasq \ | 31 | --with-dnsmasq=${bindir}/dnsmasq \ |
33 | --with-nmtui=yes \ | 32 | --with-nmtui=yes \ |
34 | " | 33 | " |
35 | 34 | ||
36 | PACKAGECONFIG ??= "nss ifupdown netconfig \ | 35 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \ |
37 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ |
38 | " | 37 | " |
39 | PACKAGECONFIG[systemd] = " \ | 38 | PACKAGECONFIG[systemd] = " \ |
@@ -47,6 +46,8 @@ PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,cons | |||
47 | PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" | 46 | PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" |
48 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" | 47 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" |
49 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" | 48 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" |
49 | # Use full featured dhcp client instead of internal one | ||
50 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" | ||
50 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 51 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
51 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" | 52 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" |
52 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" | 53 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" |
@@ -72,7 +73,6 @@ RRECOMMENDS_${PN} += "iptables dnsmasq" | |||
72 | RCONFLICTS_${PN} = "connman" | 73 | RCONFLICTS_${PN} = "connman" |
73 | RDEPENDS_${PN} = " \ | 74 | RDEPENDS_${PN} = " \ |
74 | wpa-supplicant \ | 75 | wpa-supplicant \ |
75 | dhcp-client \ | ||
76 | " | 76 | " |
77 | 77 | ||
78 | FILES_${PN}-dbg += " \ | 78 | FILES_${PN}-dbg += " \ |