summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2014-10-20 15:27:45 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-27 12:50:00 +0100
commit4c3a2f5c5f55501fb1bd90efc9fc54c65e5a2f8c (patch)
tree91fb6bc66851b2cace65a9941888bf88f4f664a6 /meta-oe
parent3e76b12150847fd700b78cdb136f800d1ac3ecb1 (diff)
downloadmeta-openembedded-4c3a2f5c5f55501fb1bd90efc9fc54c65e5a2f8c.tar.gz
networkmanager: make shared connections work
* set correct path for dnsmasq * add dnsmasq to RRECOMMENDS this popped up when testing access point enabled for network-manager-applet Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
index 0792e8ed1..8d37c980e 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
@@ -30,6 +30,7 @@ EXTRA_OECONF = " \
30 --with-dhclient=${base_sbindir}/dhclient \ 30 --with-dhclient=${base_sbindir}/dhclient \
31 --with-iptables=${sbindir}/iptables \ 31 --with-iptables=${sbindir}/iptables \
32 --with-tests \ 32 --with-tests \
33 --with-dnsmasq=${bindir}/dnsmasq \
33" 34"
34 35
35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" 36PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
@@ -80,7 +81,7 @@ FILES_${PN} += " \
80 ${systemd_unitdir}/system/NetworkManager-wait-online.service \ 81 ${systemd_unitdir}/system/NetworkManager-wait-online.service \
81" 82"
82 83
83RRECOMMENDS_${PN} += "iptables" 84RRECOMMENDS_${PN} += "iptables dnsmasq"
84RCONFLICTS_${PN} = "connman" 85RCONFLICTS_${PN} = "connman"
85RDEPENDS_${PN} = " \ 86RDEPENDS_${PN} = " \
86 wpa-supplicant \ 87 wpa-supplicant \