* [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.32.12
@ 2021-12-01 9:37 James Hilliard
2021-12-04 20:33 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: James Hilliard @ 2021-12-01 9:37 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, James Hilliard
Migrate autotools build system to meson.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/network-manager/Config.in | 1 +
package/network-manager/network-manager.hash | 4 +-
package/network-manager/network-manager.mk | 117 +++++++++++++------
3 files changed, 86 insertions(+), 36 deletions(-)
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 43987451b6..2392d26d7f 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -41,6 +41,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI
config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
bool "modem-manager support"
select BR2_PACKAGE_MODEM_MANAGER
+ select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
help
This option enables support for ModemManager
diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash
index c9d4826a0b..b007a6e88e 100644
--- a/package/network-manager/network-manager.hash
+++ b/package/network-manager/network-manager.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.2.sha256sum
-sha256 701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873 NetworkManager-1.32.2.tar.xz
+# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.12.sha256sum
+sha256 a8ab36a0a502fe73cd8e3bacb6585f97fbb94ebef79e276cdbaf11c33ff8f54b NetworkManager-1.32.12.tar.xz
# Locally computed
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index fbd5b1c85c..ac21257671 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -5,11 +5,11 @@
################################################################################
NETWORK_MANAGER_VERSION_MAJOR = 1.32
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
NETWORK_MANAGER_INSTALL_STAGING = YES
-NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
+NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus gnutls libglib2 \
libgcrypt wireless_tools util-linux host-intltool readline libndp
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md
@@ -17,72 +17,121 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome
NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager
NETWORK_MANAGER_SELINUX_MODULES = networkmanager
-NETWORK_MANAGER_CONF_ENV = \
- ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
- ac_cv_file__etc_fedora_release=no \
- ac_cv_file__etc_mandriva_release=no \
- ac_cv_file__etc_debian_version=no \
- ac_cv_file__etc_redhat_release=no \
- ac_cv_file__etc_SuSE_release=no
-
NETWORK_MANAGER_CONF_OPTS = \
- --disable-introspection \
- --disable-tests \
- --disable-qt \
- --disable-more-warnings \
- --with-crypto=gnutls \
- --with-iptables=/usr/sbin/iptables \
- --disable-ifupdown \
- --without-nm-cloud-setup
+ -Ddocs=false \
+ -Dtests=no \
+ -Dqt=false \
+ -Dcrypto=gnutls \
+ -Diptables=/usr/sbin/iptables \
+ -Difupdown=false \
+ -Dnm_cloud_setup=false \
+ -Dsession_tracking_consolekit=false
+
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+NETWORK_MANAGER_DEPENDENCIES += gobject-introspection
+NETWORK_MANAGER_CONF_OPTS += -Dintrospection=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Dintrospection=false
+endif
ifeq ($(BR2_PACKAGE_OFONO),y)
NETWORK_MANAGER_DEPENDENCIES += ofono
-NETWORK_MANAGER_CONF_OPTS += --with-ofono
+NETWORK_MANAGER_CONF_OPTS += -Dofono=true
else
-NETWORK_MANAGER_CONF_OPTS += --without-ofono
+NETWORK_MANAGER_CONF_OPTS += -Dofono=false
+endif
+
+ifeq ($(BR2_PACKAGE_IWD),y)
+NETWORK_MANAGER_DEPENDENCIES += iwd
+NETWORK_MANAGER_CONF_OPTS += -Diwd=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Diwd=false
+endif
+
+ifeq ($(BR2_PACKAGE_AUDIT),y)
+NETWORK_MANAGER_DEPENDENCIES += audit
+NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
+else
+NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
endif
ifeq ($(BR2_PACKAGE_LIBCURL),y)
NETWORK_MANAGER_DEPENDENCIES += libcurl
-NETWORK_MANAGER_CONF_OPTS += --enable-concheck
+NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPSL),y)
+NETWORK_MANAGER_DEPENDENCIES += libpsl
+NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+NETWORK_MANAGER_DEPENDENCIES += libselinux
+NETWORK_MANAGER_CONF_OPTS += -Dselinux=true
else
-NETWORK_MANAGER_CONF_OPTS += --disable-concheck
+NETWORK_MANAGER_CONF_OPTS += -Dselinux=false
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
NETWORK_MANAGER_DEPENDENCIES += newt
-NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
+NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true
else
-NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no
+NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
NETWORK_MANAGER_DEPENDENCIES += pppd
-NETWORK_MANAGER_CONF_OPTS += --enable-ppp
+NETWORK_MANAGER_CONF_OPTS += -Dppp=true
else
-NETWORK_MANAGER_CONF_OPTS += --disable-ppp
+NETWORK_MANAGER_CONF_OPTS += -Dppp=false
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
-NETWORK_MANAGER_DEPENDENCIES += modem-manager
-NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
+NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info
+NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false
+endif
+
+ifeq ($(BR2_PACKAGE_POLKIT),y)
+NETWORK_MANAGER_DEPENDENCIES += polkit
+NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
+else
+NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+NETWORK_MANAGER_DEPENDENCIES += systemd
+NETWORK_MANAGER_CONF_OPTS += \
+ -Dsystemd_journal=true \
+ -Dconfig_logging_backend_default=journal \
+ -Dsession_tracking=systemd \
+ -Dsuspend_resume=systemd
else
-NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
+NETWORK_MANAGER_CONF_OPTS += \
+ -Dsystemd_journal=false \
+ -Dconfig_logging_backend_default=syslog \
+ -Dsession_tracking=no \
+ -Dsuspend_resume=upower
endif
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
-NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient
+NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient
endif
ifeq ($(BR2_PACKAGE_DHCPCD),y)
-NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
+NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
-NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_CONF_OPTS += -Dovs=true
NETWORK_MANAGER_DEPENDENCIES += jansson
else
-NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+NETWORK_MANAGER_CONF_OPTS += -Dovs=false
endif
define NETWORK_MANAGER_INSTALL_INIT_SYSV
@@ -95,4 +144,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
endef
-$(eval $(autotools-package))
+$(eval $(meson-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.32.12
2021-12-01 9:37 [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.32.12 James Hilliard
@ 2021-12-04 20:33 ` Thomas Petazzoni
2021-12-05 0:21 ` James Hilliard
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2021-12-04 20:33 UTC (permalink / raw)
To: James Hilliard; +Cc: Eric Le Bihan, buildroot
Hello James,
On Wed, 1 Dec 2021 02:37:27 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:
> Migrate autotools build system to meson.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Why is the migration to meson tied to the version bump? The current
version of network-manager packaged in Buildroot, 1.32.2, already has
the meson build infrastructure. So really the bump to 1.32.12 has
nothing to do with the meson migration it seems.
> NETWORK_MANAGER_VERSION_MAJOR = 1.32
> -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
> +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12
> NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
> NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
> NETWORK_MANAGER_INSTALL_STAGING = YES
> -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
> +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus gnutls libglib2 \
Why is dbus now a build-time dependency?
> NETWORK_MANAGER_CONF_OPTS = \
> - --disable-introspection \
> - --disable-tests \
> - --disable-qt \
> - --disable-more-warnings \
> - --with-crypto=gnutls \
> - --with-iptables=/usr/sbin/iptables \
> - --disable-ifupdown \
> - --without-nm-cloud-setup
> + -Ddocs=false \
> + -Dtests=no \
Sometimes "false", sometimes "no", is this logical?
> +ifeq ($(BR2_PACKAGE_IWD),y)
> +NETWORK_MANAGER_DEPENDENCIES += iwd
> +NETWORK_MANAGER_CONF_OPTS += -Diwd=true
> +else
> +NETWORK_MANAGER_CONF_OPTS += -Diwd=false
> +endif
> +
> +ifeq ($(BR2_PACKAGE_AUDIT),y)
> +NETWORK_MANAGER_DEPENDENCIES += audit
> +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
> +else
> +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
Ditto. Is there a reason why it's sometimes yes/no and sometimes
true/false?
> +ifeq ($(BR2_PACKAGE_POLKIT),y)
> +NETWORK_MANAGER_DEPENDENCIES += polkit
> +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
> +else
> +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
> +endif
Is the polkit optional dependency new in 1.32.12 ? If not, it should be
a separate commit.
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +NETWORK_MANAGER_DEPENDENCIES += systemd
> +NETWORK_MANAGER_CONF_OPTS += \
> + -Dsystemd_journal=true \
> + -Dconfig_logging_backend_default=journal \
> + -Dsession_tracking=systemd \
> + -Dsuspend_resume=systemd
> else
> -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
> +NETWORK_MANAGER_CONF_OPTS += \
> + -Dsystemd_journal=false \
> + -Dconfig_logging_backend_default=syslog \
> + -Dsession_tracking=no \
> + -Dsuspend_resume=upower
This whole systemd logic also seems new, is it related to the version
bump?
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.32.12
2021-12-04 20:33 ` Thomas Petazzoni
@ 2021-12-05 0:21 ` James Hilliard
0 siblings, 0 replies; 3+ messages in thread
From: James Hilliard @ 2021-12-05 0:21 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Eric Le Bihan, buildroot
On Sat, Dec 4, 2021 at 1:33 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello James,
>
> On Wed, 1 Dec 2021 02:37:27 -0700
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > Migrate autotools build system to meson.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>
> Why is the migration to meson tied to the version bump? The current
> version of network-manager packaged in Buildroot, 1.32.2, already has
> the meson build infrastructure. So really the bump to 1.32.12 has
> nothing to do with the meson migration it seems.
I had just tested them at the same time, I can do a separate bump first.
>
>
> > NETWORK_MANAGER_VERSION_MAJOR = 1.32
> > -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
> > +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12
> > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
> > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
> > NETWORK_MANAGER_INSTALL_STAGING = YES
> > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
> > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus gnutls libglib2 \
>
> Why is dbus now a build-time dependency?
Due to the meson build system requiring the dbus pkg-config files.
>
> > NETWORK_MANAGER_CONF_OPTS = \
> > - --disable-introspection \
> > - --disable-tests \
> > - --disable-qt \
> > - --disable-more-warnings \
> > - --with-crypto=gnutls \
> > - --with-iptables=/usr/sbin/iptables \
> > - --disable-ifupdown \
> > - --without-nm-cloud-setup
> > + -Ddocs=false \
> > + -Dtests=no \
>
> Sometimes "false", sometimes "no", is this logical?
Probably not...but that's what upstream requires here...
>
> > +ifeq ($(BR2_PACKAGE_IWD),y)
> > +NETWORK_MANAGER_DEPENDENCIES += iwd
> > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true
> > +else
> > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_AUDIT),y)
> > +NETWORK_MANAGER_DEPENDENCIES += audit
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
> > +else
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
>
> Ditto. Is there a reason why it's sometimes yes/no and sometimes
> true/false?
Upstream is rather inconsistent with the option names.
>
>
> > +ifeq ($(BR2_PACKAGE_POLKIT),y)
> > +NETWORK_MANAGER_DEPENDENCIES += polkit
> > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
> > +else
> > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
> > +endif
>
> Is the polkit optional dependency new in 1.32.12 ? If not, it should be
> a separate commit.
I don't think it's new but setting this was required due to meson
being stricter.
>
> > +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> > +NETWORK_MANAGER_DEPENDENCIES += systemd
> > +NETWORK_MANAGER_CONF_OPTS += \
> > + -Dsystemd_journal=true \
> > + -Dconfig_logging_backend_default=journal \
> > + -Dsession_tracking=systemd \
> > + -Dsuspend_resume=systemd
> > else
> > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
> > +NETWORK_MANAGER_CONF_OPTS += \
> > + -Dsystemd_journal=false \
> > + -Dconfig_logging_backend_default=syslog \
> > + -Dsession_tracking=no \
> > + -Dsuspend_resume=upower
>
> This whole systemd logic also seems new, is it related to the version
> bump?
Related to the meson migration.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-05 0:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 9:37 [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.32.12 James Hilliard
2021-12-04 20:33 ` Thomas Petazzoni
2021-12-05 0:21 ` James Hilliard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.