From 35b93c81ffe69b41e0db0f5af2f6789700d39853 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 5 Nov 2019 15:14:17 +0100 Subject: [PATCH 1/5] modemmanager: fix bearer disconnection logic The bearer status wasn't being loaded in key/value mode, and therefore would always fail to load the IPv4 config method. Signed-off-by: Aleksander Morgado --- net/modemmanager/Makefile | 2 +- net/modemmanager/files/modemmanager.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 61f42bafd..94849b3cc 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.10.8 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto index 963f70c79..cc35ebefd 100755 --- a/net/modemmanager/files/modemmanager.proto +++ b/net/modemmanager/files/modemmanager.proto @@ -375,7 +375,7 @@ proto_modemmanager_teardown() { } # load bearer connection method - bearerstatus=$(mmcli --bearer "${bearerpath}") + bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue) bearermethod=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method") [ -n "${bearermethod}" ] || { echo "couldn't load bearer method" From a346d2b9537a3ddab1e9db8abd21af5b4ee6257a Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 5 Nov 2019 14:12:29 +0100 Subject: [PATCH 2/5] modemmanager: install carrier mapping configuration files Since ModemManager 1.10.2, per-device carrier mapping configuration files may be installed, providing support for automatic carrier config selection. Signed-off-by: Aleksander Morgado --- net/modemmanager/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 94849b3cc..83ef3abd5 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.10.8 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager @@ -117,6 +117,9 @@ define Package/modemmanager/install $(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_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager From fa3f9542de8a72f14a3936d428aa867a18fb4ced Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 5 Nov 2019 15:19:51 +0100 Subject: [PATCH 3/5] modemmanager: add missing path for PID file The procd based init setup uses a custom `pidfile` parameter, but the used MODEMMANAGER_PID_FILE was not being defined anywhere. Signed-off-by: Aleksander Morgado --- net/modemmanager/Makefile | 2 +- net/modemmanager/files/modemmanager.common | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 83ef3abd5..a5f6194db 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.10.8 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager diff --git a/net/modemmanager/files/modemmanager.common b/net/modemmanager/files/modemmanager.common index 4e62f428a..2f882e496 100644 --- a/net/modemmanager/files/modemmanager.common +++ b/net/modemmanager/files/modemmanager.common @@ -11,6 +11,7 @@ # Runtime state MODEMMANAGER_RUNDIR="/var/run/modemmanager" +MODEMMANAGER_PID_FILE="${MODEMMANAGER_RUNDIR}/modemmanager.pid" MODEMMANAGER_CDCWDM_CACHE="${MODEMMANAGER_RUNDIR}/cdcwdm.cache" MODEMMANAGER_SYSFS_CACHE="${MODEMMANAGER_RUNDIR}/sysfs.cache" MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache" From fc47c47b39c5d3658b200d401f9e0cda151dda7a Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 6 Nov 2019 15:44:29 +0100 Subject: [PATCH 4/5] modemmanager: add proto dynamic defaults on dhcp setup Also, explicitly close the JSON object. Signed-off-by: Aleksander Morgado --- net/modemmanager/Makefile | 2 +- net/modemmanager/files/modemmanager.proto | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index a5f6194db..d8b250b14 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.10.8 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto index cc35ebefd..6fb763e5e 100755 --- a/net/modemmanager/files/modemmanager.proto +++ b/net/modemmanager/files/modemmanager.proto @@ -175,7 +175,9 @@ modemmanager_connected_method_dhcp() { json_add_string name "${interface}_4" json_add_string ifname "@${interface}" json_add_string proto "dhcp" + proto_add_dynamic_defaults [ -n "$metric" ] && json_add_int metric "${metric}" + json_close_object ubus call network add_dynamic "$(json_dump)" } From 579dd0b3bfa1e8a68f0bb5035ea40001df07c43e Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 7 Nov 2019 10:04:53 +0100 Subject: [PATCH 5/5] modemmanager: bump to version 1.12.0 Signed-off-by: Aleksander Morgado --- net/modemmanager/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index d8b250b14..6ebcb4b8f 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager -PKG_VERSION:=1.10.8 -PKG_RELEASE:=7 +PKG_VERSION:=1.12.0 +PKG_RELEASE:=1 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager -PKG_HASH:=cbe174078dbdf3f746a55f0004353d3c27da2a31da553036d90fc7dc34a0169a +PKG_HASH:=3daca86164145fffb589939433f596c13fa077c9a187c0d5820fdd5b4e4a6424 PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION) PKG_MAINTAINER:=Nicholas Smith