forked from openwrt/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request openwrt#22427 from Linaro1985/update_mm_1.22.0
modemmanager: bump to 1.22.0
- Loading branch information
Showing
4 changed files
with
21 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,12 +8,12 @@ | |
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=modemmanager | ||
| PKG_SOURCE_VERSION:=1.20.6 | ||
| PKG_RELEASE:=14 | ||
| PKG_SOURCE_VERSION:=1.22.0 | ||
| PKG_RELEASE:=1 | ||
|
|
||
| PKG_SOURCE_PROTO:=git | ||
| PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git | ||
| PKG_MIRROR_HASH:=e90103e2e42bb826bbbac83937a9a69f50348cd6ce0d8da655a12b65494ce7c9 | ||
| PKG_MIRROR_HASH:=98daa1a15075c88afb3ed0de20dc83fe51d2ba3c66318ce3f731da4616a2e192 | ||
|
|
||
| PKG_MAINTAINER:=Nicholas Smith <[email protected]> | ||
| PKG_LICENSE:=GPL-2.0-or-later | ||
|
|
@@ -64,6 +64,7 @@ MESON_ARGS += \ | |
| -Dintrospection=false \ | ||
| -Dman=false \ | ||
| -Dbash_completion=false \ | ||
| -Dbuiltin_plugins=true \ | ||
| -Db_lto=true \ | ||
| -Dmbim=$(if $(CONFIG_MODEMMANAGER_WITH_MBIM),true,false) \ | ||
| -Dqmi=$(if $(CONFIG_MODEMMANAGER_WITH_QMI),true,false) \ | ||
|
|
@@ -98,10 +99,6 @@ 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/10-report-down $(1)/usr/lib/ModemManager/connection.d | ||
|
|
||
|
|
||
13 changes: 13 additions & 0 deletions
13
net/modemmanager/patches/100-ublox-remove-ID_MM_PROCESS-tags.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- a/src/plugins/ublox/77-mm-ublox-port-types.rules | ||
| +++ b/src/plugins/ublox/77-mm-ublox-port-types.rules | ||
| @@ -88,8 +88,8 @@ SUBSYSTEMS=="usb", ATTRS{bInterfaceNumbe | ||
| # ttyUSB2 (if #2): secondary | ||
| # ttyUSB3 (if #3): unused (ignore) | ||
| ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="00", ENV{ID_MM_PORT_IGNORE}="1" | ||
| -ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1", ENV{ID_MM_DEVICE_PROCESS}="1" | ||
| -ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="02", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1", ENV{ID_MM_DEVICE_PROCESS}="1" | ||
| +ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1" | ||
| +ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="02", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1" | ||
| ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="908b", ENV{.MM_USBIFNUM}=="03", ENV{ID_MM_PORT_IGNORE}="1" | ||
|
|
||
| LABEL="mm_ublox_port_types_end" |