modemmanager: add config optional netifd integration

This change introduces an optional configuration
of the  netifd integration in the ModemManager package.
When disabled, it removes the NETIFD dependency and
other unwanted components from the root filesystem
during the build phase.

Additionally, in the modemmanager.common the netifd-proto.sh
inclusion line can be savely removed as there is no usage
of it in its functions.

Signed-off-by: Gilles Lenaerts <gilles.lenaerts_ext@softathome.com>

diff --git a/net/modemmanager/Config.in b/net/modemmanager/Config.in
index ebcb60dbccea78035719f533fc6e573cc8a42f60..90248a8e1f5048237b1bfb05a3bf1ac2b54f1d77 100644 (file)
--- a/net/modemmanager/Config.in
+++ b/net/modemmanager/Config.in
@@ -1,6 +1,12 @@
 menu "Configuration"
        depends on PACKAGE_modemmanager
 
+config MODEMMANAGER_WITH_NETIFD
+       bool "Include netifd support"
+       default y
+       help
+         Provide ModemManager with netifd support
+         
 config MODEMMANAGER_WITH_MBIM
        bool "Include MBIM support"
        default y

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index fc50a7478a64268bdc1d0b11c066f6008bbacf6b..6fb6539de1ae67de3aa06c6ba739c0307f074982 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -153,9 +153,11 @@ define Package/modemmanager/install
        $(INSTALL_DATA) ./files/etc/hotplug.d/wwan/25-modemmanager-wwan \
                $(1)/etc/hotplug.d/wwan
 
+ifeq ($(CONFIG_MODEMMANAGER_WITH_NETIFD),y)
        $(INSTALL_DIR) $(1)/lib/netifd/proto
        $(INSTALL_BIN) ./files/lib/netifd/proto/modemmanager.sh \
                $(1)/lib/netifd/proto
+endif
 endef
 
 define Package/modemmanager-rpcd/install

diff --git a/net/modemmanager/files/usr/share/ModemManager/modemmanager.common b/net/modemmanager/files/usr/share/ModemManager/modemmanager.common
index 0315673d88bf9f597f4a8d9d578339337b9bbcde..bc35eaca97374d58ce25a4591bb007d74f300a71 100644 (file)
--- a/net/modemmanager/files/usr/share/ModemManager/modemmanager.common
+++ b/net/modemmanager/files/usr/share/ModemManager/modemmanager.common
@@ -5,7 +5,6 @@
 ################################################################################
 
 . /lib/functions.sh
-. /lib/netifd/netifd-proto.sh
 
 ################################################################################
 # Runtime state