Skip to content

[25.12] backport Modemmanager fixes from master #29926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
champtar merged 2 commits into from
Jul 5, 2026
+42 −2
Merged

[25.12] backport Modemmanager fixes from master #29926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
252342d
modemmanager: fix netifd proto sim path
micpf Feb 9, 2026
abe9b07
modemmanager: fix dependency and ci
champtar Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion net/modemmanager/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=modemmanager
PKG_VERSION:=1.24.0
PKG_RELEASE:=8
PKG_RELEASE:=10

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
Expand Down Expand Up @@ -61,6 +61,7 @@ define Package/modemmanager-rpcd
URL:=https://www.freedesktop.org/wiki/Software/ModemManager
DEPENDS:= \
modemmanager \
+lua \
+lua-cjson
endef

Expand Down
4 changes: 3 additions & 1 deletion net/modemmanager/files/lib/netifd/proto/modemmanager.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ modemmanager_check_state_locked() {

local unlock_required unlock_retries unlock_retry unlock_lock
local unlock_value unlock_match
local sim_path

if [ -z "$pincode" ]; then
echo "PIN required"
Expand Down Expand Up @@ -434,7 +435,8 @@ modemmanager_check_state_locked() {
return 1
fi

mmcli --modem="${device}" -i any --pin=${pincode} || {
sim_path="$(modemmanager_get_field "${modemstatus}" "modem.generic.sim")"
mmcli --modem="${device}" -i "${sim_path}" --pin=${pincode} || {
proto_notify_error "${interface}" MM_PINCODE_WRONG
proto_block_restart "${interface}"
return 1
Expand Down
19 changes: 19 additions & 0 deletions net/modemmanager/test-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh

# shellcheck shell=busybox

case "$PKG_NAME" in
modemmanager)
ModemManager --version | grep -F "$PKG_VERSION"
;;

modemmanager-rpcd)
# no version to check
exit 0
;;

*)
echo "Untested package: $PKG_NAME" >&2
exit 1
;;
esac
18 changes: 18 additions & 0 deletions net/modemmanager/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh

# shellcheck shell=busybox

case "$PKG_NAME" in
modemmanager)
exit 0
;;

modemmanager-rpcd)
/usr/libexec/rpcd/modemmanager list ""
;;

*)
echo "Untested package: $PKG_NAME" >&2
exit 1
;;
esac
Loading