ChangeLog: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.50.0/NEWS
Drop 0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch as it has been merged upstream. Signed-off-by: Yi Zhao <[email protected]> --- ...re-Disable-sd_dhcp6_client_set_duid_.patch | 65 ------------------- ...er_1.48.10.bb => networkmanager_1.50.0.bb} | 3 +- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.48.10.bb => networkmanager_1.50.0.bb} (98%) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch deleted file mode 100644 index 8e246efe01..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 34d7a6c9919a73c2e716835000944c17438b2ca1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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) - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966] -Signed-off-by: Khem Raj <[email protected]> ---- - src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ - .../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 e664a4a..7ba5020 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 7c20116..08c1e96 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/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb similarity index 98% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb index a9b9233b7e..9d2b1f2670 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb @@ -40,11 +40,10 @@ SRC_URI = " \ file://${BPN}.initd \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ - file://0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch \ " SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613" +SRC_URI[sha256sum] = "fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3" S = "${WORKDIR}/NetworkManager-${PV}" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114553): https://lists.openembedded.org/g/openembedded-devel/message/114553 Mute This Topic: https://lists.openembedded.org/mt/110290924/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
