From 67cb61bea5876227226603e58d3f74e5032b734d Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Sat, 3 Oct 2026 16:24:26 +0200 Subject: [PATCH] package/network-manager: bump version to 1.58.1 Upstream changelog: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.58.1/NEWS?ref_type=tags Changes relevant for Buildroot build: * Support for dhclient has been removed, drop the conditional block for BR2_PACKAGE_DHCP_CLIENT=y. * NetworkManager now installs a systemd generator to manage its initrd units, disable it if building without systemd or for systemd without initrd support by setting the target system generator directory to "no" [1]. Note that the current upstream main branch adds a build option for initrd support, likely to be released with 1.60.x, which should supersede removing the initrd units and disabling the generator when building with systemd. * Contrary to what the NEWS file states, the new "clat" build option is enabled by default. Disable it, (optionally) enabling would require libbpf and a suitable BPF compiler. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.58.1/meson.build?ref_type=tags#L416-417 Signed-off-by: Fiona Klute Signed-off-by: Julien Olivain --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index fe2f2ae262..ff2748ff72 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.56.0/downloads/NetworkManager-1.56.0.tar.xz.sha256sum -sha256 59a32d385cc1e7ae26e43798c6f12d07ff6198abd041ec0620b3a08cfc021ccc NetworkManager-1.56.0.tar.xz +# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.58.1/downloads/NetworkManager-1.58.1.tar.xz.sha256sum +sha256 262864cfd198123d3e5dbe91937441b97ee9059d6d712e1a5bfbb1c54668d14d NetworkManager-1.58.1.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 c96f613831..5071546c27 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.56 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.58 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).1 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/$(NETWORK_MANAGER_VERSION)/downloads NETWORK_MANAGER_INSTALL_STAGING = YES @@ -34,7 +34,8 @@ NETWORK_MANAGER_CONF_OPTS = \ -Dmodprobe=/sbin/modprobe \ -Difupdown=false \ -Dnm_cloud_setup=false \ - -Dsession_tracking_consolekit=false + -Dsession_tracking_consolekit=false \ + -Dclat=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit @@ -43,10 +44,6 @@ else NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif -ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient -endif - ifeq ($(BR2_PACKAGE_DHCPCD),y) NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif @@ -153,6 +150,7 @@ NETWORK_MANAGER_CONF_OPTS += \ -Dsession_tracking=systemd \ -Dsuspend_resume=systemd ifneq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) +NETWORK_MANAGER_CONF_OPTS += -Dsystemdsystemgeneratordir=no define NETWORK_MANAGER_CLEAN_INITRD rm -f $(TARGET_DIR)/usr/lib/systemd/system/NetworkManager-*initrd.service endef @@ -164,6 +162,7 @@ NETWORK_MANAGER_CONF_OPTS += \ -Dconfig_logging_backend_default=syslog \ -Dsession_tracking=no \ -Dsuspend_resume=consolekit \ + -Dsystemdsystemgeneratordir=no \ -Dsystemdsystemunitdir=no endif