ModemManager: refactoring procd init script
The way the init script is written now, we get a bad output when calling
the ubus service backend.
ubus call service list "{'verbose':true,'name':'modemmanager'}"
>{
> "modemmanager": {
> "instances": {
> "instance1": {
> "running": true,
> "pid": 20511,
> "command": [
> "sh",
> "-c",
> ".
>/usr/share/ModemManager/modemmanager.common; \t
>mkdir -m 0755 -p /var/run/modemmanager; \t
>mm_cleanup_interfaces; \t
>( mm_report_events_from_cache ) >/dev/null 2>&1 & \t
>/usr/sbin/ModemManager"
> ],
> "term_timeout": 5,
> "respawn": {
> "threshold": 3600,
> "timeout": 5,
> "retry": 5
> },
> "pidfile":"/var/run/modemmanager/modemmanager.pid"
> }
> }
> }
>}"
I also get the output in the log that the PID file cannot be created.
> daemon.err procd: Failed to remove pidfile: :No such file or directory
The changes in this commit fixes this issues, by moving startup into a
wrapper script.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years ago |
|
- #
- # Copyright (C) 2016 Velocloud Inc.
- # Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
- #
- # This is free software, licensed under the GNU General Public License v2.
- #
-
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=modemmanager
- PKG_VERSION:=1.18.6
- PKG_RELEASE:=$(AUTORELEASE)
-
- PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
- PKG_HASH:=d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a
- PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION)
-
- PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
- PKG_LICENSE:=GPL-2.0-or-later
- PKG_LICENSE_FILES:=COPYING
-
- PKG_INSTALL:=1
- PKG_BUILD_PARALLEL:=1
-
- include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/nls.mk
-
- define Package/modemmanager/config
- source "$(SOURCE)/Config.in"
- endef
-
- define Package/modemmanager
- SECTION:=net
- CATEGORY:=Network
- TITLE:=Control utility for any kind of mobile broadband modem
- URL:=https://www.freedesktop.org/wiki/Software/ModemManager
- DEPENDS:= \
- $(INTL_DEPENDS) \
- +glib2 \
- +dbus \
- +ppp \
- +MODEMMANAGER_WITH_MBIM:libmbim \
- +MODEMMANAGER_WITH_QMI:libqmi
- endef
-
- define Package/modemmanager/description
- ModemManager is a D-Bus-activated service which allows controlling mobile
- broadband modems. Add kernel modules for your modems as needed.
- Select Utilities/usb-modeswitch if needed.
- endef
-
- CONFIGURE_ARGS += \
- --without-polkit \
- --without-udev \
- --without-systemdsystemunitdir \
- --disable-rpath \
- --disable-gtk-doc
-
- ifeq ($(CONFIG_MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS),y)
- CONFIGURE_ARGS += --with-at-command-via-dbus
- endif
-
- ifdef CONFIG_MODEMMANAGER_WITH_MBIM
- CONFIGURE_ARGS += --with-mbim
- else
- CONFIGURE_ARGS += --without-mbim
- endif
-
- ifdef CONFIG_MODEMMANAGER_WITH_QMI
- CONFIGURE_ARGS += --with-qmi
- else
- CONFIGURE_ARGS += --without-qmi
- endif
-
- define Build/Prepare
- $(call Build/Prepare/Default)
- ( cd "$(PKG_BUILD_DIR)"; \
- printf "all:\ninstall:\n" >po/Makefile.in.in; \
- )
- endef
-
- define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include/ModemManager
- $(CP) $(PKG_INSTALL_DIR)/usr/include/ModemManager/*.h $(1)/usr/include/ModemManager
- $(INSTALL_DIR) $(1)/usr/include/libmm-glib
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libmm-glib/*.h $(1)/usr/include/libmm-glib
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so* $(1)/usr/lib
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ModemManager.pc $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mm-glib.pc $(1)/usr/lib/pkgconfig
- endef
-
- define Package/modemmanager/install
- $(INSTALL_DIR) $(1)/lib/udev/rules.d
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d
-
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
- $(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
-
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
-
- $(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)/etc/dbus-1/system.d
- $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
-
- $(INSTALL_DIR) $(1)/usr/share/dbus-1/system-services
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service $(1)/usr/share/dbus-1/system-services
-
- $(INSTALL_DIR) $(1)/usr/share/ModemManager
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager
- $(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager
-
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
-
- $(INSTALL_DIR) $(1)/etc/hotplug.d/usb
- $(INSTALL_DATA) ./files/25-modemmanager-usb $(1)/etc/hotplug.d/usb
-
- $(INSTALL_DIR) $(1)/etc/hotplug.d/net
- $(INSTALL_DATA) ./files/25-modemmanager-net $(1)/etc/hotplug.d/net
-
- $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
- $(INSTALL_DATA) ./files/25-modemmanager-tty $(1)/etc/hotplug.d/tty
-
- $(INSTALL_DIR) $(1)/etc/hotplug.d/wwan
- $(INSTALL_DATA) ./files/25-modemmanager-wwan $(1)/etc/hotplug.d/wwan
-
- $(INSTALL_DIR) $(1)/lib/netifd/proto
- $(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh
- endef
-
- $(eval $(call BuildPackage,modemmanager))
|