Signed-off-by: Adrian Freihofer <[email protected]>
---
.../networkmanager/networkmanager_1.0.6.bb | 10 ++++++----
1 file changed, 6 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 c11602a..27b6378 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
@@ -43,15 +43,14 @@ EXTRA_OECONF = " \
--disable-more-warnings \
--with-iptables=${sbindir}/iptables \
--with-tests \
- --with-dnsmasq=${bindir}/dnsmasq \
--with-nmtui=yes \
"
# If you need a different configuration for networkmanager, add lines similar
to
# the following example to your local.conf or distro config
-# PACKAGECONFIG_remove_pn-networkmanager = "nss ifupdown netconfig dhclient"
+# PACKAGECONFIG_remove_pn-networkmanager = "nss ifupdown netconfig dhclient
dnsmasq"
# PACKAGECONFIG_append_pn-networkmanager = " gnutls modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
"
PACKAGECONFIG[systemd] = " \
@@ -67,6 +66,7 @@ PACKAGECONFIG[modemmanager] =
"--with-modem-manager-1=yes,--with-modem-manager-1
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[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls
libgcrypt"
PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
@@ -88,7 +88,9 @@ FILES_${PN} += " \
${systemd_unitdir}/system \
"
-RRECOMMENDS_${PN} += "iptables dnsmasq"
+RRECOMMENDS_${PN} += "iptables \
+ ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
+"
RCONFLICTS_${PN} = "connman"
RDEPENDS_${PN} = " \
wpa-supplicant \
--
2.4.3
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
