diff options
| author |   Adrian <adrian.freihofer@gmail.com> | 2015-11-11 20:48:16 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:28:23 +0100 |
| commit | 4217c83cc25cdca86499ded3c78b8e3af417a89e (patch) | |
| tree | f9cb053fcce4b5cf144156191e21790949b13774 /meta-oe/recipes-connectivity/networkmanager | |
| parent | b8de598558f100eb51fe5a21394e0a4ab7024578 (diff) | |
| download | meta-openembedded-contrib-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/networkmanager')
| -rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 8 |
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 c03630d4e7..e8fe9604d7 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 = " \ --disable-more-warnings \ --with-iptables=${sbindir}/iptables \ --with-tests \ - --with-dnsmasq=${bindir}/dnsmasq \ --with-nmtui=yes \ " -PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \ +PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ " PACKAGECONFIG[systemd] = " \ @@ -48,6 +47,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" PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" @@ -69,7 +69,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 \ |