Signed-off-by: Adrian Freihofer <[email protected]>
---
.../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 590ce3b..383aae9 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
@@ -50,7 +50,7 @@ EXTRA_OECONF = " \
# the following examples to your local.conf or distro config
# PACKAGECONFIG_pn-networkmanager = "systemd gnutls wifi"
# PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq adsl \
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
"
@@ -71,6 +71,7 @@ PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls
libgcrypt"
PACKAGECONFIG[wifi] =
"--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant
wireless-tools"
+PACKAGECONFIG[adsl] = ""
PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
@@ -131,4 +132,9 @@ SYSTEMD_SERVICE_${PN} = "NetworkManager.service
NetworkManager-dispatcher.servic
do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run
+
+ # Delete adsl plugin if adsl is not in config flags
+ if ${@bb.utils.contains('PACKAGECONFIG','adsl','false','true',d)}; then
+ rm ${D}/${libdir}/NetworkManager/libnm-device-plugin-adsl.so
+ fi
}
--
2.4.3
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
