tjh.dev
1From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jun 2024 14:03:15 -0700
4Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
5 function
6
7When building on musl systems ( with out systemd ), and using LLD linker
8from LLVM project we fail to link with undefined symbols.
9
10This symbol is in sd_id128.c but its disabled, so let disable the functions
11which need this function.
12
13| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
14| >>> 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)
15| >>> 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
16| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
21 .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++-
22 2 files changed, 4 insertions(+), 1 deletion(-)
23
24diff --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
25index e664a4a720..7ba502086f 100644
26--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
27+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
28@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
29 return 0;
30 }
31
32+#if 0
33 int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
34 sd_id128_t machine_id;
35 int r;
36@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
37 duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
38 return 0;
39 }
40+#endif
41
42 int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
43 _cleanup_free_ char *p = NULL, *x = NULL;
44diff --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
45index 7c20116409..08c1e96b3c 100644
46--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
47+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
48@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
49 return 0;
50 }
51
52+#if 0
53 int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
54 int r;
55
56@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
57
58 return 0;
59 }
60-
61+#endif
62 int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
63 int r;
64
65--
66GitLab
67