mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 16:01:54 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/network-manager: bump version to 1.48.10

Browse Source 
Upstream changelog:
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.48.10/NEWS?ref_type=tags

Packaging changes:

NM removed UPower suspend/resume support because it has been removed
from UPower, the new fallback is consolekit.
05ef682bb5

Add patch required to build with musl due to changes in imported
libsystemd code (merged upstream in 1.49.x dev branch):
118e3117fe

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fiona Klute (WIWA)
2024-09-09 16:57:15 +02:00
committed by Thomas Petazzoni
parent 75b543880c
commit 817b22f114
3 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
package/network-manager/0001-libnm-systemd-core-disable-sd_dhcp6_client_set_duid_uuid.patch Normal file
View File

@@ -0,0 +1,68 @@
From 118e3117fe48f18cb2175b3cbc95a6ea3ced28b2 Mon Sep 17 00:00:00 2001
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>
Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/118e3117fe48f18cb2175b3cbc95a6ea3ced28b2
Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
2 files changed, 4 insertions(+)
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 e664a4a7207..28abddfbc5e 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 /* NM_IGNORED */
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 /* NM_IGNORED */
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 7c20116409e..a6b55d07e0b 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 /* NM_IGNORED */
int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
int r;
@@ -256,6 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
return 0;
}
+#endif /* NM_IGNORED */
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;
--
GitLab

4
package/network-manager/network-manager.hash
View File

@@ -1,5 +1,5 @@
# From https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.sha256sum
sha256 722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068 NetworkManager-1.46.0.tar.xz
# From https://download.gnome.org/sources/NetworkManager/1.48/NetworkManager-1.48.8.sha256sum
sha256 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 NetworkManager-1.48.10.tar.xz
# Locally computed
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL

6
package/network-manager/network-manager.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
NETWORK_MANAGER_VERSION_MAJOR = 1.46
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0
NETWORK_MANAGER_VERSION_MAJOR = 1.48
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10
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
@@ -144,7 +144,7 @@ NETWORK_MANAGER_CONF_OPTS += \
-Dsystemd_journal=false \
-Dconfig_logging_backend_default=syslog \
-Dsession_tracking=no \
-Dsuspend_resume=upower \
-Dsuspend_resume=consolekit \
-Dsystemdsystemunitdir=no
endif