From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: yegorslists@googlemail.com
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>,
Aleksander Morgado <aleksander@aleksander.es>,
buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] package/modem-manager: bump to version 1.18.2
Date: Sun, 19 Sep 2021 09:33:19 +0200 [thread overview]
Message-ID: <20210919073319.GG1053080@scaer> (raw)
In-Reply-To: <20210918203023.24093-1-yegorslists@googlemail.com>
Yegor, All,
On 2021-09-18 22:30 +0200, yegorslists--- via buildroot spake thusly:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> This release introduces meson build system support.
No, the release itself does not introduce meson buildsystem support:
> As meson files are only available in git, switch the location to
> https://gitlab.freedesktop.org.
as you say, the support for meson is only in git, and not part of the
released tarball. As such, I don't think it should be considered usable,
so we should not use ir.
When upstream does an actual release that contains the meson stuff, then
we can consider switching over. Until then, I think we should stick to
using the buildsystem in the released tarball, autotools.
Regards,
Yann E. MORIN.
> Add support for bash-completion.
>
> dbus is now a build-time dependency.
>
> Also add support for systemd and polkit and disable the manpage
> generation.
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/modem-manager/Config.in | 2 +-
> package/modem-manager/modem-manager.hash | 2 +-
> package/modem-manager/modem-manager.mk | 50 +++++++++++++++++-------
> 3 files changed, 38 insertions(+), 16 deletions(-)
>
> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
> index c4c723776d..d211d68ee1 100644
> --- a/package/modem-manager/Config.in
> +++ b/package/modem-manager/Config.in
> @@ -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
> diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash
> index 14597215df..fb0ddec4a5 100644
> --- a/package/modem-manager/modem-manager.hash
> +++ b/package/modem-manager/modem-manager.hash
> @@ -1,4 +1,4 @@
> # Locally computed
> -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz
> +sha256 79e83f7082d02e72a5c5e7fdf9b67bd3dd71da0da3d02607dee76ae06b9d4aa9 ModemManager-1.18.2.tar.bz2
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
> diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
> index a881edc272..7a7bd3bb4c 100644
> --- a/package/modem-manager/modem-manager.mk
> +++ b/package/modem-manager/modem-manager.mk
> @@ -4,42 +4,64 @@
> #
> ################################################################################
>
> -MODEM_MANAGER_VERSION = 1.16.10
> -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
> -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
> +MODEM_MANAGER_VERSION = 1.18.2
> +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.bz2
> +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 libglib2 dbus $(TARGET_NLS_DEPENDENCIES)
> MODEM_MANAGER_INSTALL_STAGING = YES
> -MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
> +
> +MODEM_MANAGER_CONF_OPTS = -Dman=false
>
> ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
> MODEM_MANAGER_DEPENDENCIES += libqmi
> -MODEM_MANAGER_CONF_OPTS += --with-qmi
> +MODEM_MANAGER_CONF_OPTS += -Dqmi=enabled
> +else
> +MODEM_MANAGER_CONF_OPTS += -Dqmi=disabled
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +MODEM_MANAGER_DEPENDENCIES += systemd
> +MODEM_MANAGER_CONF_OPTS += -Dsystemd_suspend_resume=true -Dsystemd_journal=true
> +else
> +MODEM_MANAGER_CONF_OPTS += -Dsystemdsystemunitdir=no -Dsystemd_suspend_resume=false -Dsystemd_journal=false
> +endif
> +
> +ifeq ($(BR2_PACKAGE_POLKIT),y)
> +MODEM_MANAGER_DEPENDENCIES += polkit
> +MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict
> else
> -MODEM_MANAGER_CONF_OPTS += --without-qmi
> +MODEM_MANAGER_CONF_OPTS += -Dpolkit=no
> endif
>
> ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
> MODEM_MANAGER_DEPENDENCIES += libgudev
> -MODEM_MANAGER_CONF_OPTS += --with-udev
> +MODEM_MANAGER_CONF_OPTS += -Dudev=enabled
> else
> -MODEM_MANAGER_CONF_OPTS += --without-udev
> +MODEM_MANAGER_CONF_OPTS += -Dudev=disabled
> endif
>
> ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
> MODEM_MANAGER_DEPENDENCIES += libmbim
> -MODEM_MANAGER_CONF_OPTS += --with-mbim
> +MODEM_MANAGER_CONF_OPTS += -Dmbim=enabled
> else
> -MODEM_MANAGER_CONF_OPTS += --without-mbim
> +MODEM_MANAGER_CONF_OPTS += -Dmbim=disabled
> endif
>
> ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
> MODEM_MANAGER_DEPENDENCIES += gobject-introspection
> -MODEM_MANAGER_CONF_OPTS += --enable-introspection
> +MODEM_MANAGER_CONF_OPTS += -Dintrospection=enabled
> +else
> +MODEM_MANAGER_CONF_OPTS += -Dintrospection=disabled
> +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 +69,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV
> $(TARGET_DIR)/etc/init.d/S44modem-manager
> endef
>
> -$(eval $(autotools-package))
> +$(eval $(meson-package))
> --
> 2.17.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2021-09-19 7:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 20:30 [Buildroot] [PATCH] package/modem-manager: bump to version 1.18.2 yegorslists--- via buildroot
2021-09-19 7:33 ` Yann E. MORIN [this message]
2021-09-19 8:22 ` Alexander Dahl
2021-09-19 8:33 ` Aleksander Morgado
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=20210919073319.GG1053080@scaer \
--to=yann.morin.1998@free.fr \
--cc=aleksander@aleksander.es \
--cc=buildroot@buildroot.org \
--cc=eric.le.bihan.dev@free.fr \
--cc=yegorslists@googlemail.com \
/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