aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 e159df6c0e..c03630d4e7 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 = " \
--disable-ifnet \
--disable-ifcfg-suse \
--disable-more-warnings \
- --with-dhclient=${base_sbindir}/dhclient \
--with-iptables=${sbindir}/iptables \
--with-tests \
--with-dnsmasq=${bindir}/dnsmasq \
--with-nmtui=yes \
"
-PACKAGECONFIG ??= "nss ifupdown netconfig \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
"
PACKAGECONFIG[systemd] = " \
@@ -47,6 +46,8 @@ PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,cons
PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
+# Use full featured dhcp client instead of internal one
+PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt"
PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
@@ -72,7 +73,6 @@ RRECOMMENDS_${PN} += "iptables dnsmasq"
RCONFLICTS_${PN} = "connman"
RDEPENDS_${PN} = " \
wpa-supplicant \
- dhcp-client \
"
FILES_${PN}-dbg += " \