modemmanager: make building builtin options optional

This commit enables to choose whether to compile the plugins into the
binary or not. If not included, it moves the plugins to
`/usr/lib/ModemManager/`.

Signed-off-by: Christian Korber <redacted>

diff --git a/net/modemmanager/Config.in b/net/modemmanager/Config.in
index 90248a8e1f5048237b1bfb05a3bf1ac2b54f1d77..ceb171c45ff1ff36474d7ece3ba076e1fb3d2986 100644 (file)
--- a/net/modemmanager/Config.in
+++ b/net/modemmanager/Config.in
@@ -33,4 +33,9 @@ config MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS
        help
          Compile ModemManager allowing AT commands without debug flag
 
+config MODEMMANAGER_WITH_BUILTIN_PLUGINS
+       bool "Build modemmanager with builtin plugins"
+       default y
+       help
+         Build ModemManager with builtin plugins
 endmenu

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index bc671bfc6f7fa2fa09b4f6cd236c938edf5bea7c..8fa6f48c6f13d632c2a5e0754f594e78888a0d7c 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -84,7 +84,7 @@ MESON_ARGS += \
        -Dintrospection=false \
        -Dman=false \
        -Dbash_completion=false \
-       -Dbuiltin_plugins=true \
+       -Dbuiltin_plugins=$(if $(CONFIG_MODEMMANAGER_WITH_BUILTIN_PLUGINS),true,false) \
        -Db_lto=true \
        -Dmbim=$(if $(CONFIG_MODEMMANAGER_WITH_MBIM),true,false) \
        -Dqmi=$(if $(CONFIG_MODEMMANAGER_WITH_QMI),true,false) \
@@ -120,6 +120,10 @@ define Package/modemmanager/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so.* $(1)/usr/lib
 
+       $(INSTALL_DIR) $(1)/usr/lib/ModemManager
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-shared-*.so* $(1)/usr/lib/ModemManager
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-plugin-*.so* $(1)/usr/lib/ModemManager
+
        $(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
        $(INSTALL_BIN) ./files/usr/lib/ModemManager/connection.d/10-report-down \
                $(1)/usr/lib/ModemManager/connection.d