* [ptxdist] [PATCH 1/2] networkmanager: switch from gnome mirror to freedesktop.org
@ 2025-05-21 9:02 Robert Schwebel
2025-05-21 9:02 ` [ptxdist] [PATCH 2/2] networkmanager: version bump 1.48.0 -> 1.52.0 Robert Schwebel
2025-06-03 10:38 ` [ptxdist] [APPLIED] networkmanager: switch from gnome mirror to freedesktop.org Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Robert Schwebel @ 2025-05-21 9:02 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
The latest network manager releases are not available on the gnome
mirror file servers. At the time of testing, the latest release in the
FDO gitlab is 1.53-dev, while the gnome mirror only has 1.51.
Switch download to the freedesktop.org gitlab. It does not provide xz
archives, so we use the bz2 files instead.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/networkmanager.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 55f697803..b8b122cad 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
# Paths and names
#
NETWORKMANAGER_VERSION := 1.48.0
-NETWORKMANAGER_MD5 := ba52091831d0d68122933a494507986a
+NETWORKMANAGER_MD5 := 45f6ed63183aac8ae9e7fd435c47da41
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
-NETWORKMANAGER_SUFFIX := tar.xz
-NETWORKMANAGER_URL := $(call ptx/mirror, GNOME, NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX))
+NETWORKMANAGER_SUFFIX := tar.bz2
+NETWORKMANAGER_URL := https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/$(NETWORKMANAGER_VERSION)/NetworkManager-$(NETWORKMANAGER_VERSION).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
--
2.39.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] networkmanager: version bump 1.48.0 -> 1.52.0
2025-05-21 9:02 [ptxdist] [PATCH 1/2] networkmanager: switch from gnome mirror to freedesktop.org Robert Schwebel
@ 2025-05-21 9:02 ` Robert Schwebel
2025-06-03 10:38 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-06-03 10:38 ` [ptxdist] [APPLIED] networkmanager: switch from gnome mirror to freedesktop.org Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Robert Schwebel @ 2025-05-21 9:02 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Support for dhcpcanon has been removed from NetworkManager, so we remove
the corresponding config option as well.
The patch has meanwhile been mainlined and can be removed.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...re-Disable-sd_dhcp6_client_set_duid_.patch | 63 -------------------
patches/NetworkManager-1.48.0/series | 4 --
rules/networkmanager.make | 5 +-
3 files changed, 2 insertions(+), 70 deletions(-)
delete mode 100644 patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
delete mode 100644 patches/NetworkManager-1.48.0/series
diff --git a/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
deleted file mode 100644
index 7605e62f4..000000000
--- a/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jun 2024 14:03:15 -0700
-Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
- function
-
-When building on musl systems ( with out systemd ), and using LLD linker
-from LLVM project we fail to link with undefined symbols.
-
-This symbol is in sd_id128.c but its disabled, so let disable the functions
-which need this function.
-
-| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
-| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202)
-| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a
-| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
- src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-index e664a4a72072..7ba502086f53 100644
---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
- return 0;
- }
-
-+#if 0
- int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
- sd_id128_t machine_id;
- int r;
-@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
- duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
- return 0;
- }
-+#endif
-
- int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
- _cleanup_free_ char *p = NULL, *x = NULL;
-diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-index 7c20116409eb..08c1e96b3c74 100644
---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
- return 0;
- }
-
-+#if 0
- int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
- int r;
-
-@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
-
- return 0;
- }
--
-+#endif
- int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
- int r;
-
diff --git a/patches/NetworkManager-1.48.0/series b/patches/NetworkManager-1.48.0/series
deleted file mode 100644
index 245a2e6d9..000000000
--- a/patches/NetworkManager-1.48.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
-# 8d2e4586c786cdc430585d83f299806a - git-ptx-patches magic
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index b8b122cad..b9f4befc8 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 1.48.0
-NETWORKMANAGER_MD5 := 45f6ed63183aac8ae9e7fd435c47da41
+NETWORKMANAGER_VERSION := 1.52.0
+NETWORKMANAGER_MD5 := 6ad017074a09bd6b9b9823d04c0265cd
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.bz2
NETWORKMANAGER_URL := https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/$(NETWORKMANAGER_VERSION)/NetworkManager-$(NETWORKMANAGER_VERSION).$(NETWORKMANAGER_SUFFIX)
@@ -44,7 +44,6 @@ NETWORKMANAGER_CONF_OPT = \
-Dcrypto=gnutls \
-Ddbus_conf_dir=/usr/share/dbus-1/system.d \
-Ddhclient=/usr/sbin/dhclient \
- -Ddhcpcanon=false \
-Ddhcpcd=false \
-Ddnsmasq=/usr/sbin/dnsmasq \
-Ddocs=false \
--
2.39.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] networkmanager: switch from gnome mirror to freedesktop.org
2025-05-21 9:02 [ptxdist] [PATCH 1/2] networkmanager: switch from gnome mirror to freedesktop.org Robert Schwebel
2025-05-21 9:02 ` [ptxdist] [PATCH 2/2] networkmanager: version bump 1.48.0 -> 1.52.0 Robert Schwebel
@ 2025-06-03 10:38 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-06-03 10:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Thanks, applied as 874d67eb12634d5811c93a144377ba2b1790eeaa.
Michael
[sent from post-receive hook]
On Tue, 03 Jun 2025 12:38:51 +0200, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> The latest network manager releases are not available on the gnome
> mirror file servers. At the time of testing, the latest release in the
> FDO gitlab is 1.53-dev, while the gnome mirror only has 1.51.
>
> Switch download to the freedesktop.org gitlab. It does not provide xz
> archives, so we use the bz2 files instead.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20250521090234.2324640-1-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index 55f6978037b2..b8b122cade2c 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> # Paths and names
> #
> NETWORKMANAGER_VERSION := 1.48.0
> -NETWORKMANAGER_MD5 := ba52091831d0d68122933a494507986a
> +NETWORKMANAGER_MD5 := 45f6ed63183aac8ae9e7fd435c47da41
> NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
> -NETWORKMANAGER_SUFFIX := tar.xz
> -NETWORKMANAGER_URL := $(call ptx/mirror, GNOME, NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX))
> +NETWORKMANAGER_SUFFIX := tar.bz2
> +NETWORKMANAGER_URL := https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/$(NETWORKMANAGER_VERSION)/NetworkManager-$(NETWORKMANAGER_VERSION).$(NETWORKMANAGER_SUFFIX)
> NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
> NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] networkmanager: version bump 1.48.0 -> 1.52.0
2025-05-21 9:02 ` [ptxdist] [PATCH 2/2] networkmanager: version bump 1.48.0 -> 1.52.0 Robert Schwebel
@ 2025-06-03 10:38 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-06-03 10:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Thanks, applied as dcebfd1002be6314a62f91a9f43e62015194090f.
Michael
[sent from post-receive hook]
On Tue, 03 Jun 2025 12:38:52 +0200, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> Support for dhcpcanon has been removed from NetworkManager, so we remove
> the corresponding config option as well.
>
> The patch has meanwhile been mainlined and can be removed.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20250521090234.2324640-2-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
> deleted file mode 100644
> index 7605e62f40fd..000000000000
> --- a/patches/NetworkManager-1.48.0/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 7 Jun 2024 14:03:15 -0700
> -Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
> - function
> -
> -When building on musl systems ( with out systemd ), and using LLD linker
> -from LLVM project we fail to link with undefined symbols.
> -
> -This symbol is in sd_id128.c but its disabled, so let disable the functions
> -which need this function.
> -
> -| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
> -| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202)
> -| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a
> -| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
> - src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | 3 ++-
> - 2 files changed, 4 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
> -index e664a4a72072..7ba502086f53 100644
> ---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
> -+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
> -@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
> - return 0;
> - }
> -
> -+#if 0
> - int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
> - sd_id128_t machine_id;
> - int r;
> -@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
> - duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
> - return 0;
> - }
> -+#endif
> -
> - int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
> - _cleanup_free_ char *p = NULL, *x = NULL;
> -diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
> -index 7c20116409eb..08c1e96b3c74 100644
> ---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
> -+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
> -@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
> - return 0;
> - }
> -
> -+#if 0
> - int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
> - int r;
> -
> -@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
> -
> - return 0;
> - }
> --
> -+#endif
> - int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
> - int r;
> -
> diff --git a/patches/NetworkManager-1.48.0/series b/patches/NetworkManager-1.48.0/series
> deleted file mode 100644
> index 245a2e6d9fce..000000000000
> --- a/patches/NetworkManager-1.48.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
> -# 8d2e4586c786cdc430585d83f299806a - git-ptx-patches magic
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index b8b122cade2c..b9f4befc89c5 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> #
> # Paths and names
> #
> -NETWORKMANAGER_VERSION := 1.48.0
> -NETWORKMANAGER_MD5 := 45f6ed63183aac8ae9e7fd435c47da41
> +NETWORKMANAGER_VERSION := 1.52.0
> +NETWORKMANAGER_MD5 := 6ad017074a09bd6b9b9823d04c0265cd
> NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
> NETWORKMANAGER_SUFFIX := tar.bz2
> NETWORKMANAGER_URL := https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/$(NETWORKMANAGER_VERSION)/NetworkManager-$(NETWORKMANAGER_VERSION).$(NETWORKMANAGER_SUFFIX)
> @@ -44,7 +44,6 @@ NETWORKMANAGER_CONF_OPT = \
> -Dcrypto=gnutls \
> -Ddbus_conf_dir=/usr/share/dbus-1/system.d \
> -Ddhclient=/usr/sbin/dhclient \
> - -Ddhcpcanon=false \
> -Ddhcpcd=false \
> -Ddnsmasq=/usr/sbin/dnsmasq \
> -Ddocs=false \
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-03 10:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-21 9:02 [ptxdist] [PATCH 1/2] networkmanager: switch from gnome mirror to freedesktop.org Robert Schwebel
2025-05-21 9:02 ` [ptxdist] [PATCH 2/2] networkmanager: version bump 1.48.0 -> 1.52.0 Robert Schwebel
2025-06-03 10:38 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-06-03 10:38 ` [ptxdist] [APPLIED] networkmanager: switch from gnome mirror to freedesktop.org Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox