summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAdrian <adrian.freihofer@gmail.com>2015-11-11 20:48:16 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:28:23 +0100
commit4217c83cc25cdca86499ded3c78b8e3af417a89e (patch)
treef9cb053fcce4b5cf144156191e21790949b13774 /meta-oe/recipes-connectivity
parentb8de598558f100eb51fe5a21394e0a4ab7024578 (diff)
downloadmeta-openembedded-4217c83cc25cdca86499ded3c78b8e3af417a89e.tar.gz
networkmanager: PACKAGECONFIG for dnsmasq
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.bb8
1 files changed, 5 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 c03630d4e..e8fe9604d 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
@@ -28,11 +28,10 @@ EXTRA_OECONF = " \
28 --disable-more-warnings \ 28 --disable-more-warnings \
29 --with-iptables=${sbindir}/iptables \ 29 --with-iptables=${sbindir}/iptables \
30 --with-tests \ 30 --with-tests \
31 --with-dnsmasq=${bindir}/dnsmasq \
32 --with-nmtui=yes \ 31 --with-nmtui=yes \
33" 32"
34 33
35PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \ 34PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
36 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
37" 36"
38PACKAGECONFIG[systemd] = " \ 37PACKAGECONFIG[systemd] = " \
@@ -48,6 +47,7 @@ PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1
48PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp" 47PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
49# Use full featured dhcp client instead of internal one 48# Use full featured dhcp client instead of internal one
50PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" 49PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
50PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
51PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" 51PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
52PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" 52PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt"
53PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" 53PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
@@ -69,7 +69,9 @@ FILES_${PN} += " \
69 ${systemd_unitdir}/system \ 69 ${systemd_unitdir}/system \
70" 70"
71 71
72RRECOMMENDS_${PN} += "iptables dnsmasq" 72RRECOMMENDS_${PN} += "iptables \
73 ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
74"
73RCONFLICTS_${PN} = "connman" 75RCONFLICTS_${PN} = "connman"
74RDEPENDS_${PN} = " \ 76RDEPENDS_${PN} = " \
75 wpa-supplicant \ 77 wpa-supplicant \