From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Ladislav Michl <oss-lists@triops.cz>
Subject: Re: [ptxdist] [APPLIED] modemmanager: version bump 1.18.12 -> 1.20.0
Date: Fri, 11 Nov 2022 15:31:20 +0100 [thread overview]
Message-ID: <20221111143120.893889-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <Y1xN4Fyv93f6PNOK@lenoch>
Thanks, applied as 624008063d1185a2fcf7e543c3050ead4c46073d.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:20 +0100, Ladislav Michl <oss-lists@triops.cz> wrote:
> 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 <ladis@linux-mips.org>
> Message-Id: <Y1xN4Fyv93f6PNOK@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/modemmanager.in b/rules/modemmanager.in
> index 5b8d03016506..bac104699943 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 f942b5a65b6c..58427ff8a326 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
prev parent reply other threads:[~2022-11-11 14:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 21:45 [ptxdist] [PATCH 0/3] ModemManager update Ladislav Michl
2022-10-28 21:46 ` [ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0 Ladislav Michl
2022-11-11 14:31 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 21:46 ` [ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0 Ladislav Michl
2022-11-11 14:31 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 21:47 ` [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0 Ladislav Michl
2022-11-11 14:31 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221111143120.893889-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=oss-lists@triops.cz \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox