modemmanager: make rpcd integration optional

ModemManager does not depend on Lua by its own, so make it possible to
not have a requirement on Lua if the rpcd integration is not needed.

Signed-off-by: Christian Svensson <blue@cmd.nu>
This commit is contained in:
Christian Svensson
2024-08-03 15:30:39 +02:00
parent 3cb95bb47e
commit f48f15a899

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager PKG_NAME:=modemmanager
PKG_VERSION:=1.22.0 PKG_VERSION:=1.22.0
PKG_RELEASE:=17 PKG_RELEASE:=18
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
@@ -43,7 +43,6 @@ define Package/modemmanager
+glib2 \ +glib2 \
+dbus \ +dbus \
+ppp \ +ppp \
+lua-cjson \
+MODEMMANAGER_WITH_MBIM:libmbim \ +MODEMMANAGER_WITH_MBIM:libmbim \
+MODEMMANAGER_WITH_QMI:libqmi \ +MODEMMANAGER_WITH_QMI:libqmi \
+MODEMMANAGER_WITH_QRTR:libqrtr-glib +MODEMMANAGER_WITH_QRTR:libqrtr-glib
@@ -55,6 +54,24 @@ define Package/modemmanager/description
Select Utilities/usb-modeswitch if needed. Select Utilities/usb-modeswitch if needed.
endef endef
define Package/modemmanager-rpcd
SECTION:=net
CATEGORY:=Network
TITLE:=RPC interface for ModemManager for rpcd
URL:=https://www.freedesktop.org/wiki/Software/ModemManager
DEPENDS:= \
modemmanager \
+lua-cjson
endef
define Package/modemmanager-rpcd/description
ModemManager is a D-Bus-activated service which allows controlling mobile
broadband modems.
This package enables an rpcd interface for getting information from
ModemManager using e.g. ubus.
endef
MESON_ARGS += \ MESON_ARGS += \
-Dudev=false \ -Dudev=false \
-Dudevdir=/lib/udev \ -Dudevdir=/lib/udev \
@@ -96,10 +113,6 @@ define Package/modemmanager/install
$(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin $(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
$(INSTALL_BIN) ./files/usr/sbin/ModemManager-monitor $(1)/usr/sbin $(INSTALL_BIN) ./files/usr/sbin/ModemManager-monitor $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/libexec/rpcd
$(INSTALL_BIN) ./files/usr/libexec/rpcd/modemmanager \
$(1)/usr/libexec/rpcd/
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
@@ -145,4 +158,11 @@ define Package/modemmanager/install
$(1)/lib/netifd/proto $(1)/lib/netifd/proto
endef endef
define Package/modemmanager-rpcd/install
$(INSTALL_DIR) $(1)/usr/libexec/rpcd
$(INSTALL_BIN) ./files/usr/libexec/rpcd/modemmanager \
$(1)/usr/libexec/rpcd/
endef
$(eval $(call BuildPackage,modemmanager)) $(eval $(call BuildPackage,modemmanager))
$(eval $(call BuildPackage,modemmanager-rpcd))