From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Oct 2022 23:47:22 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ooXCE-005poq-EB for lore@lore.pengutronix.de; Fri, 28 Oct 2022 23:47:22 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ooXCD-0006Li-B9; Fri, 28 Oct 2022 23:47:21 +0200 Received: from h2.cmg2.smtp.forpsi.com ([81.2.195.189]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ooXC6-0005gR-Vu for ptxdist@pengutronix.de; Fri, 28 Oct 2022 23:47:15 +0200 Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id oXC4ouHwMv5uIoXC6oLNQS; Fri, 28 Oct 2022 23:47:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1666993634; bh=DejzRV6bDZwM59fnMujTjW0KDj1sd5Hiik0gSW0ctf4=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=N+V77Ln/c/XlXwc1GycISK6sPbkzThixp7YQWDwBf1rBM3mRvvllN1J0OWpyBIb+n oeoacmryh/zMPoCZFFz7j5B9xbXX7Xb0RhFiAtQkzFicp4Yp0rkJZ4W5PimUc8jxqx thT0aUDZC2HR5TSVo9vYA/hxKAccNF3VcySGDW9zg94AP1fCLxD8rSf9MJ5IrZCEfC qcs/qkVtNO/zptoEU3//DpTjxPpNvvYtvmfgf9dU9vFHSemUPRh3Ah8TK/Q0/PJTjC RUDA0BbrpF86NSwTWfq/z8qgkKL43G2aBxF+Ha+J2ScoMORoTklwaOoA0pB1GP51YG EWFXpjYwNa5yQ== Date: Fri, 28 Oct 2022 23:47:12 +0200 From: Ladislav Michl To: ptxdist@pengutronix.de Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfDh5mp0NrN9dd1XLLo6zh75EmVU4xgcDGYfV7wskLQzctZx5cAHzGFmRNbaXye/3Uld1VOqlVAiES2NFl7BeqT4Ib5TkCEYA2xvlt0JQj0V3ITTGDdPz yTfpkL0eYAWmGWKvxcAABnakVApA9fI/t9z2BR8XmcGZvV6KmhnpjfmC X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false From: Ladislav Michl There is no longer an upstream-provided source tarball. This is the last stable release with autoconf support which is considered deprecated and will be removed in future releases in favour of meson, so do the change now. dbus-1 is now mandatory dependency. This release comes with lots of new features, see announcement: https://lists.freedesktop.org/archives/modemmanager-devel/2022-October/009481.html Signed-off-by: Ladislav Michl --- rules/modemmanager.in | 3 ++- rules/modemmanager.make | 60 +++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/rules/modemmanager.in b/rules/modemmanager.in index 5b8d03016..bac104699 100644 --- a/rules/modemmanager.in +++ b/rules/modemmanager.in @@ -2,7 +2,8 @@ menuconfig MODEMMANAGER tristate - select DBUS if MODEMMANAGER_ALLOW_DBUS_AT_CMDS && RUNTIME + select HOST_MESON + select DBUS select GLIB select UDEV select LIBGUDEV diff --git a/rules/modemmanager.make b/rules/modemmanager.make index f942b5a65..58427ff8a 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.18.12 -MODEMMANAGER_MD5 := 9f014dfc59f1bd8bc230bb2c2974d104 +MODEMMANAGER_VERSION := 1.20.0 +MODEMMANAGER_MD5 := 900b2e707a2095a4b476b68d1efb1c34 MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) -MODEMMANAGER_SUFFIX := tar.xz -MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) +MODEMMANAGER_SUFFIX := tar.bz2 +MODEMMANAGER_URL := https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) MODEMMANAGER_SOURCE := $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) MODEMMANAGER_DIR := $(BUILDDIR)/$(MODEMMANAGER) MODEMMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later @@ -30,38 +30,32 @@ MODEMMANAGER_LICENSE_FILES := \ # Prepare # ---------------------------------------------------------------------------- -#MODEMMANAGER_CONF_ENV := $(CROSS_ENV) - # -# autoconf +# meson # -MODEMMANAGER_CONF_TOOL := autoconf +MODEMMANAGER_CONF_TOOL := meson MODEMMANAGER_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-compile-warnings \ - --disable-Werror \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-nls \ - --disable-rpath \ - --disable-code-coverage \ - --disable-introspection \ - --disable-vala \ - --enable-all-plugins \ - --with-gnu-ld \ - --without-gcov \ - --without-qrtr \ - --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ - --with-udev-base-dir=/usr/lib/udev \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-udev \ - --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \ - --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \ - --without-polkit \ - --$(call ptx/wwo, PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS)-at-command-via-dbus \ - --with-mbim \ - --with-qmi + $(CROSS_MESON_USR) \ + -Dudev=true \ + -Dudevdir=/usr/lib/udev \ + -Dtests=true \ + -Ddbus_policy_dir=/usr/share/dbus-1/system.d \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system \ + -Dsystemd_suspend_resume=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \ + -Dpowerd_suspend_resume=false \ + -Dsystemd_journal=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \ + -Dpolkit=no \ + -Dat_command_via_dbus=$(call ptx/truefalse, PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS) \ + -Dmbim=true \ + -Dqmi=true \ + -Dqrtr=false \ + -Dintrospection=false \ + -Dvapi=false \ + -Dgtk_doc=false \ + -Dman=false \ + -Dbash_completion=false + +# sadly, ModemManager does not build with -Dtests=false # ---------------------------------------------------------------------------- # Target-Install -- 2.32.0