Skip to contentSkip to conversation

package/modem-manager: bump version to 1.20.2

PATCH Applied Heiko Thiery 2 participants 3 messages Dec 12, 2022 – Dec 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/modem-manager: bump version to 1.20.2

Switch package type to meson as the primary supported build system from now on is meson and the autotools support as despricated. The package tarball is no longer support, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL.

All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are:
bash_completion, polkit, systemd, qrtr.

The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values.

For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required.

---
 package/modem-manager/Config.in          |  2 +-
 package/modem-manager/modem-manager.hash |  2 +-
 package/modem-manager/modem-manager.mk   | 72 ++++++++++++++++++------
 3 files changed, 56 insertions(+), 20 deletions(-)
package/modem-manager/Config.in +1 -1
index c4c723776d..d211d68ee1 100644
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_DBUS # runtime dependency
+	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV
 	help
package/modem-manager/modem-manager.hash +1 -1
index 40c8ad703f..e6967f8d62 100644
@@ -1,4 +1,4 @@
 #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc
-sha256  b464e4925d955a6ca86dd08616e763b26ae46d7fd37dbe281678e34065b1e430  ModemManager-1.18.12.tar.xz
+sha256  ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179  ModemManager-1.20.2.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/modem-manager/modem-manager.mk +54 -18

100 lines not on this page · raw message

Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi,

Am Mo., 12. Dez. 2022 um 20:35 Uhr schrieb Heiko Thiery <[email protected]>:

Quoted 15 lines

Switch package type to meson as the primary supported build system from now on is meson and the autotools support as despricated. The package tarball is no longer support, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL.

All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are:
bash_completion, polkit, systemd, qrtr.

The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values.

Quoted 5 lines

For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required.

---

I forgot to add the history ;-/

v3:
- remove mention of runtime dependency in Config.in
- explained in commit log why dbus dependency is need and why udevdir needed

Signature · 1 line
Heiko
Quoted 135 lines
 package/modem-manager/Config.in          |  2 +-
 package/modem-manager/modem-manager.hash |  2 +-
 package/modem-manager/modem-manager.mk   | 72 ++++++++++++++++++------
 3 files changed, 56 insertions(+), 20 deletions(-)
package/modem-manager/Config.in +1 -1
index c4c723776d..d211d68ee1 100644
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER
        depends on BR2_USE_WCHAR # libglib2 and gnutls
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
-       select BR2_PACKAGE_DBUS # runtime dependency
+       select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV
        help
package/modem-manager/modem-manager.hash +1 -1
index 40c8ad703f..e6967f8d62 100644
@@ -1,4 +1,4 @@
 #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc
-sha256  b464e4925d955a6ca86dd08616e763b26ae46d7fd37dbe281678e34065b1e430  ModemManager-1.18.12.tar.xz
+sha256  ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179  ModemManager-1.20.2.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/modem-manager/modem-manager.mk +54 -19
index d0c9b7377b..8a0dbba3a4 100644
@@ -4,42 +4,78 @@
 #
 ################################################################################
 
-MODEM_MANAGER_VERSION = 1.18.12
-MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
-MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
+MODEM_MANAGER_VERSION = 1.20.2
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz
+MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION)
 MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
 MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB
 MODEM_MANAGER_SELINUX_MODULES = modemmanager
-MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt
 MODEM_MANAGER_INSTALL_STAGING = YES
-MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
+MODEM_MANAGER_CONF_OPTS = \
+       -Dpowerd_suspend_resume=false \
+       -Dudevdir=/usr/lib/udev
 
-ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
-MODEM_MANAGER_DEPENDENCIES += libqmi
-MODEM_MANAGER_CONF_OPTS += --with-qmi
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
+MODEM_MANAGER_DEPENDENCIES += libgudev
+MODEM_MANAGER_CONF_OPTS += -Dudev=true
 else
-MODEM_MANAGER_CONF_OPTS += --without-qmi
+MODEM_MANAGER_CONF_OPTS += -Dudev=false
 endif
 
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-MODEM_MANAGER_DEPENDENCIES += libgudev
-MODEM_MANAGER_CONF_OPTS += --with-udev
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+MODEM_MANAGER_DEPENDENCIES += libqmi
+MODEM_MANAGER_CONF_OPTS += -Dqmi=true
 else
-MODEM_MANAGER_CONF_OPTS += --without-udev
+MODEM_MANAGER_CONF_OPTS += -Dqmi=false
 endif
 
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
 MODEM_MANAGER_DEPENDENCIES += libmbim
-MODEM_MANAGER_CONF_OPTS += --with-mbim
+MODEM_MANAGER_CONF_OPTS += -Dmbim=true
+else
+MODEM_MANAGER_CONF_OPTS += -Dmbim=false
+endif
+
+ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y)
+MODEM_MANAGER_DEPENDENCIES += libqrtr-glib
+MODEM_MANAGER_CONF_OPTS += -Dqrtr=true
+else
+MODEM_MANAGER_CONF_OPTS += -Dqrtr=false
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+MODEM_MANAGER_DEPENDENCIES += systemd
+MODEM_MANAGER_CONF_OPTS += \
+       -Dsystemd_journal=true \
+       -Dsystemd_suspend_resume=true \
+       -Dsystemdsystemunitdir=/usr/lib/systemd/system
+else
+MODEM_MANAGER_CONF_OPTS += \
+       -Dsystemd_journal=false \
+       -Dsystemd_suspend_resume=false \
+       -Dsystemdsystemunitdir=no
+endif
+
+ifeq ($(BR2_PACKAGE_POLKIT),y)
+MODEM_MANAGER_DEPENDENCIES += polkit
+MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict
 else
-MODEM_MANAGER_CONF_OPTS += --without-mbim
+MODEM_MANAGER_CONF_OPTS += -Dpolkit=no
 endif
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
 MODEM_MANAGER_DEPENDENCIES += gobject-introspection
-MODEM_MANAGER_CONF_OPTS += --enable-introspection
+MODEM_MANAGER_CONF_OPTS += -Dintrospection=true
+else
+MODEM_MANAGER_CONF_OPTS += -Dintrospection=false
+endif
+
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+MODEM_MANAGER_DEPENDENCIES += bash-completion
+MODEM_MANAGER_CONF_OPTS += -Dbash_completion=true
 else
-MODEM_MANAGER_CONF_OPTS += --disable-introspection
+MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false
 endif
 
 define MODEM_MANAGER_INSTALL_INIT_SYSV
@@ -47,4 +83,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV
                $(TARGET_DIR)/etc/init.d/S44modem-manager
 endef
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
--
Quoted 2 lines

2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
In reply to Heiko Thiery
Quoted 17 lines · On Mon, 12 Dec 2022 20:35:28 +0100 Heiko Thiery <[email protected]> wrote:

Switch package type to meson as the primary supported build system from now on is meson and the autotools support as despricated. The package tarball is no longer support, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL.

All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are:
bash_completion, polkit, systemd, qrtr.

The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values.

For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required.

Quoted 6 lines
---
 package/modem-manager/Config.in          |  2 +-
 package/modem-manager/modem-manager.hash |  2 +-
 package/modem-manager/modem-manager.mk   | 72 ++++++++++++++++++------
 3 files changed, 56 insertions(+), 20 deletions(-)

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot