summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch6
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch23
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch26
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch30
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch61
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch26
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb (renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb)44
7 files changed, 159 insertions, 57 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
index 302c0292bd..19c8c74811 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
@@ -1,4 +1,4 @@
1From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001 1From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
2From: Pablo Saavedra <psaavedra@igalia.com> 2From: Pablo Saavedra <psaavedra@igalia.com>
3Date: Tue, 13 Mar 2018 17:36:20 +0100 3Date: Tue, 13 Mar 2018 17:36:20 +0100
4Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations 4Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
8 1 file changed, 1 insertion(+), 1 deletion(-) 8 1 file changed, 1 insertion(+), 1 deletion(-)
9 9
10diff --git a/configure.ac b/configure.ac 10diff --git a/configure.ac b/configure.ac
11index 967eac0..b914219 100644 11index 65ceffb..ad4b0fc 100644
12--- a/configure.ac 12--- a/configure.ac
13+++ b/configure.ac 13+++ b/configure.ac
14@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then 14@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
15 AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) 15 AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
16 16
17 AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) 17 AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index 5581dd3aab..446637b276 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -1,4 +1,4 @@
1From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 1From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Thu, 22 Mar 2018 11:08:30 +0100 3Date: Thu, 22 Mar 2018 11:08:30 +0100
4Subject: [PATCH] Do not create settings settings/property documentation 4Subject: [PATCH] Do not create settings settings/property documentation
@@ -6,23 +6,29 @@ MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
8 8
9From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
10MIME-Version: 1.0
11Content-Type: text/plain; charset=UTF-8
12Content-Transfer-Encoding: 8bit
13
9It was tried to get this work but gi / GirRepository could not be found by 14It was tried to get this work but gi / GirRepository could not be found by
10python. Anyway it is not necessary for us to have the settings/property docs. 15python. Anyway it is not necessary for us to have the settings/property docs.
11 16
12Upstream-Status: Inappropriate [OE specific] 17Upstream-Status: Inappropriate [OE specific]
13 18
14Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 19Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
20
15--- 21---
16 Makefile.am | 11 ----------- 22 Makefile.am | 11 -----------
17 configure.ac | 5 ----- 23 configure.ac | 5 -----
18 2 files changed, 16 deletions(-) 24 2 files changed, 16 deletions(-)
19 25
20diff --git a/Makefile.am b/Makefile.am 26diff --git a/Makefile.am b/Makefile.am
21index b180466..1ab4658 100644 27index d5cbcf5..2a1819a 100644
22--- a/Makefile.am 28--- a/Makefile.am
23+++ b/Makefile.am 29+++ b/Makefile.am
24@@ -1298,9 +1298,7 @@ EXTRA_DIST += \ 30@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
25 if HAVE_INTROSPECTION 31 INTROSPECTION_GIRS += libnm/NM-1.0.gir
26 32
27 libnm_noinst_data = \ 33 libnm_noinst_data = \
28- libnm/nm-property-docs.xml \ 34- libnm/nm-property-docs.xml \
@@ -31,7 +37,7 @@ index b180466..1ab4658 100644
31 libnm/nm-settings-keyfile-docs.xml \ 37 libnm/nm-settings-keyfile-docs.xml \
32 libnm/nm-settings-ifcfg-rh-docs.xml 38 libnm/nm-settings-ifcfg-rh-docs.xml
33 39
34@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) 40@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
35 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp 41 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
36 42
37 clients_common_settings_doc_h = clients/common/settings-docs.h 43 clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -51,10 +57,10 @@ index b180466..1ab4658 100644
51 $(clients_common_settings_doc_h) \ 57 $(clients_common_settings_doc_h) \
52 $(clients_common_settings_doc_h).in 58 $(clients_common_settings_doc_h).in
53diff --git a/configure.ac b/configure.ac 59diff --git a/configure.ac b/configure.ac
54index b914219..872c292 100644 60index ad4b0fc..0092092 100644
55--- a/configure.ac 61--- a/configure.ac
56+++ b/configure.ac 62+++ b/configure.ac
57@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0) 63@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
58 # check if we can build setting property documentation 64 # check if we can build setting property documentation
59 build_docs=no 65 build_docs=no
60 if test -n "$INTROSPECTION_MAKEFILE"; then 66 if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -66,6 +72,3 @@ index b914219..872c292 100644
66 AC_PATH_PROG(PERL, perl) 72 AC_PATH_PROG(PERL, perl)
67 if test -z "$PERL"; then 73 if test -z "$PERL"; then
68 AC_MSG_ERROR([--enable-introspection requires perl]) 74 AC_MSG_ERROR([--enable-introspection requires perl])
69--
702.20.1
71
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
index af6f938ced..c23fc308fd 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
@@ -1,4 +1,4 @@
1From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001 1From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 2 Apr 2019 01:34:35 +0200 3Date: Tue, 2 Apr 2019 01:34:35 +0200
4Subject: [PATCH] Fix build with musl - systemd specific 4Subject: [PATCH] Fix build with musl - systemd specific
@@ -12,6 +12,7 @@ for musl.
12Upstream-Status: Pending 12Upstream-Status: Pending
13 13
14Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 14Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
15
15--- 16---
16 shared/systemd/src/basic/in-addr-util.c | 1 + 17 shared/systemd/src/basic/in-addr-util.c | 1 +
17 shared/systemd/src/basic/process-util.c | 9 +++++++++ 18 shared/systemd/src/basic/process-util.c | 9 +++++++++
@@ -22,10 +23,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
22 6 files changed, 27 insertions(+), 23 deletions(-) 23 6 files changed, 27 insertions(+), 23 deletions(-)
23 24
24diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c 25diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
25index 5899f62..0adb248 100644 26index 91d687c..8388304 100644
26--- a/shared/systemd/src/basic/in-addr-util.c 27--- a/shared/systemd/src/basic/in-addr-util.c
27+++ b/shared/systemd/src/basic/in-addr-util.c 28+++ b/shared/systemd/src/basic/in-addr-util.c
28@@ -14,6 +14,7 @@ 29@@ -15,6 +15,7 @@
29 #include "in-addr-util.h" 30 #include "in-addr-util.h"
30 #include "macro.h" 31 #include "macro.h"
31 #include "parse-util.h" 32 #include "parse-util.h"
@@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
34 #include "strxcpyx.h" 35 #include "strxcpyx.h"
35 #include "util.h" 36 #include "util.h"
36diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c 37diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
37index 7431be3..189060a 100644 38index 1456167..42f51a0 100644
38--- a/shared/systemd/src/basic/process-util.c 39--- a/shared/systemd/src/basic/process-util.c
39+++ b/shared/systemd/src/basic/process-util.c 40+++ b/shared/systemd/src/basic/process-util.c
40@@ -21,6 +21,9 @@ 41@@ -17,6 +17,9 @@
41 #include <sys/wait.h> 42 #include <sys/wait.h>
42 #include <syslog.h> 43 #include <syslog.h>
43 #include <unistd.h> 44 #include <unistd.h>
@@ -47,7 +48,7 @@ index 7431be3..189060a 100644
47 #if 0 /* NM_IGNORED */ 48 #if 0 /* NM_IGNORED */
48 #if HAVE_VALGRIND_VALGRIND_H 49 #if HAVE_VALGRIND_VALGRIND_H
49 #include <valgrind/valgrind.h> 50 #include <valgrind/valgrind.h>
50@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) { 51@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
51 cached_pid = CACHED_PID_UNSET; 52 cached_pid = CACHED_PID_UNSET;
52 } 53 }
53 54
@@ -61,7 +62,7 @@ index 7431be3..189060a 100644
61 62
62 pid_t getpid_cached(void) { 63 pid_t getpid_cached(void) {
63 static bool installed = false; 64 static bool installed = false;
64@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) { 65@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
65 * only half-documented (glibc doesn't document it but LSB does — though only superficially) 66 * only half-documented (glibc doesn't document it but LSB does — though only superficially)
66 * we'll check for errors only in the most generic fashion possible. */ 67 * we'll check for errors only in the most generic fashion possible. */
67 68
@@ -74,10 +75,10 @@ index 7431be3..189060a 100644
74 cached_pid = CACHED_PID_UNSET; 75 cached_pid = CACHED_PID_UNSET;
75 return new_pid; 76 return new_pid;
76diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h 77diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
77index 15443f1..4807198 100644 78index a0886e0..da47d14 100644
78--- a/shared/systemd/src/basic/socket-util.h 79--- a/shared/systemd/src/basic/socket-util.h
79+++ b/shared/systemd/src/basic/socket-util.h 80+++ b/shared/systemd/src/basic/socket-util.h
80@@ -13,6 +13,12 @@ 81@@ -14,6 +14,12 @@
81 #include <sys/types.h> 82 #include <sys/types.h>
82 #include <sys/un.h> 83 #include <sys/un.h>
83 84
@@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
147 #include <stdio.h> 148 #include <stdio.h>
148 #include <sys/types.h> 149 #include <sys/types.h>
149diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h 150diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
150index b23f4c8..8f2f6e0 100644 151index 04cc82b..2cf589a 100644
151--- a/shared/systemd/src/basic/string-util.h 152--- a/shared/systemd/src/basic/string-util.h
152+++ b/shared/systemd/src/basic/string-util.h 153+++ b/shared/systemd/src/basic/string-util.h
153@@ -27,6 +27,11 @@ 154@@ -26,6 +26,11 @@
154 #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) 155 #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
155 #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) 156 #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
156 157
@@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
162 int strcmp_ptr(const char *a, const char *b) _pure_; 163 int strcmp_ptr(const char *a, const char *b) _pure_;
163 164
164 static inline bool streq_ptr(const char *a, const char *b) { 165 static inline bool streq_ptr(const char *a, const char *b) {
165--
1662.17.1
167
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
index e0973af1e9..196a3358d0 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
@@ -1,7 +1,7 @@
1From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001 1From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 8 Apr 2019 23:10:43 +0200 3Date: Mon, 8 Apr 2019 23:10:43 +0200
4Subject: [PATCH 2/2] Fix build with musl 4Subject: [PATCH] Fix build with musl
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for
32Upstream-Status: Pending 32Upstream-Status: Pending
33 33
34Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 34Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
35
35--- 36---
36 clients/tui/nmt-device-entry.c | 1 - 37 clients/tui/nmt-device-entry.c | 1 -
37 libnm-core/nm-utils.h | 4 ++++ 38 libnm-core/nm-utils.h | 4 ++++
@@ -41,10 +42,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
41 5 files changed, 8 insertions(+), 3 deletions(-) 42 5 files changed, 8 insertions(+), 3 deletions(-)
42 43
43diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c 44diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
44index 43fbbc1..3eae286 100644 45index 4ab5932..915248c 100644
45--- a/clients/tui/nmt-device-entry.c 46--- a/clients/tui/nmt-device-entry.c
46+++ b/clients/tui/nmt-device-entry.c 47+++ b/clients/tui/nmt-device-entry.c
47@@ -39,7 +39,6 @@ 48@@ -26,7 +26,6 @@
48 #include "nmt-device-entry.h" 49 #include "nmt-device-entry.h"
49 50
50 #include <sys/socket.h> 51 #include <sys/socket.h>
@@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
53 #include "nmtui.h" 54 #include "nmtui.h"
54 55
55diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h 56diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
56index 2b5baba..f7abab6 100644 57index 5418a1e..f492da6 100644
57--- a/libnm-core/nm-utils.h 58--- a/libnm-core/nm-utils.h
58+++ b/libnm-core/nm-utils.h 59+++ b/libnm-core/nm-utils.h
59@@ -25,6 +25,10 @@ 60@@ -10,6 +10,10 @@
60 #error "Only <NetworkManager.h> can be included directly." 61 #error "Only <NetworkManager.h> can be included directly."
61 #endif 62 #endif
62 63
@@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
68 69
69 #include <netinet/in.h> 70 #include <netinet/in.h>
70diff --git a/shared/nm-default.h b/shared/nm-default.h 71diff --git a/shared/nm-default.h b/shared/nm-default.h
71index 54e9916..26e9f4e 100644 72index ace6ede..25357da 100644
72--- a/shared/nm-default.h 73--- a/shared/nm-default.h
73+++ b/shared/nm-default.h 74+++ b/shared/nm-default.h
74@@ -211,6 +211,9 @@ 75@@ -182,6 +182,9 @@
75 #endif 76 #endif
76 77
77 #include <stdlib.h> 78 #include <stdlib.h>
@@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
82 /*****************************************************************************/ 83 /*****************************************************************************/
83 84
84diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c 85diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
85index bd4fbcc..f70b309 100644 86index 3bbc975..4e8a3f6 100644
86--- a/src/devices/nm-device.c 87--- a/src/devices/nm-device.c
87+++ b/src/devices/nm-device.c 88+++ b/src/devices/nm-device.c
88@@ -24,6 +24,7 @@ 89@@ -9,6 +9,7 @@
89 #include "nm-device.h" 90 #include "nm-device.h"
90 91
91 #include <netinet/in.h> 92 #include <netinet/in.h>
@@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
93 #include <unistd.h> 94 #include <unistd.h>
94 #include <sys/ioctl.h> 95 #include <sys/ioctl.h>
95 #include <signal.h> 96 #include <signal.h>
96@@ -32,7 +33,6 @@ 97@@ -17,7 +18,6 @@
97 #include <arpa/inet.h> 98 #include <arpa/inet.h>
98 #include <fcntl.h> 99 #include <fcntl.h>
99 #include <linux/if_addr.h> 100 #include <linux/if_addr.h>
@@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
102 #include <linux/pkt_sched.h> 103 #include <linux/pkt_sched.h>
103 104
104diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c 105diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
105index d4b0115..22a3a90 100644 106index 7abe4df..9f53147 100644
106--- a/src/platform/nm-linux-platform.c 107--- a/src/platform/nm-linux-platform.c
107+++ b/src/platform/nm-linux-platform.c 108+++ b/src/platform/nm-linux-platform.c
108@@ -28,7 +28,6 @@ 109@@ -14,7 +14,6 @@
109 #include <libudev.h> 110 #include <libudev.h>
110 #include <linux/fib_rules.h> 111 #include <linux/fib_rules.h>
111 #include <linux/ip.h> 112 #include <linux/ip.h>
@@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
113 #include <linux/if_bridge.h> 114 #include <linux/if_bridge.h>
114 #include <linux/if_link.h> 115 #include <linux/if_link.h>
115 #include <linux/if_tun.h> 116 #include <linux/if_tun.h>
116--
1172.17.1
118
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
new file mode 100644
index 0000000000..62252826e2
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
@@ -0,0 +1,61 @@
1From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001
2From: Adrian Freihofer <adrian.freihofer@siemens.com>
3Date: Sat, 7 Mar 2020 14:22:36 +0100
4Subject: [PATCH 3/4] Fix build with musl for n-dhcp4
5
6---
7 shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++
8 shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++
9 2 files changed, 12 insertions(+)
10
11diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
12index e4477a7..75713c8 100644
13--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
14+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
15@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
16 seed16v[1] = (u64 >> 16) ^ (u64 >> 0);
17 seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
18
19+#ifdef __GLIBC__
20 r = seed48_r(seed16v, &config->entropy);
21 c_assert(!r);
22+#else
23+ memcpy(config->entropy, seed16v, sizeof seed16v);
24+#endif
25 }
26
27 /**
28@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
29 */
30 uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) {
31 long int result;
32+#ifdef __GLIBC__
33 int r;
34
35 r = mrand48_r(&config->entropy, &result);
36 c_assert(!r);
37+#else
38+ result = jrand48(config->entropy);
39+#endif
40
41 return result;
42 };
43diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h
44index 436ee80..ffcb4b2 100644
45--- a/shared/n-dhcp4/src/n-dhcp4-private.h
46+++ b/shared/n-dhcp4/src/n-dhcp4-private.h
47@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig {
48 bool inform_only;
49 bool init_reboot;
50 struct in_addr requested_ip;
51+#ifdef __GLIBC__
52 struct drand48_data entropy; /* entropy pool */
53+#else
54+ unsigned short entropy[3]; /* entropy pool */
55+#endif
56 uint64_t ms_start_delay; /* max ms to wait before starting probe */
57 NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
58 int8_t request_parameters[UINT8_MAX + 1];
59--
602.24.1
61
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
new file mode 100644
index 0000000000..55aa4d2655
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
@@ -0,0 +1,26 @@
1From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001
2From: Adrian Freihofer <adrian.freihofer@siemens.com>
3Date: Sat, 7 Mar 2020 14:24:01 +0100
4Subject: [PATCH 4/4] Fix build with musl - systemd specific
5
6---
7 src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
8 1 file changed, 2 insertions(+)
9
10diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
11index e1150f9..2c63bac 100644
12--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
13+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
14@@ -7,7 +7,9 @@
15
16 #include <errno.h>
17 #include <sys/ioctl.h>
18+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */
19 #include <linux/if_arp.h>
20+#endif
21 #include <linux/if_infiniband.h>
22
23 #include "sd-dhcp6-client.h"
24--
252.24.1
26
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
index 27508c4d93..297f05618b 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
@@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
2HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" 2HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager"
3SECTION = "net/misc" 3SECTION = "net/misc"
4 4
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ 7 file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
8" 8"
9 9
10DEPENDS = " \ 10DEPENDS = " \
@@ -30,9 +30,11 @@ SRC_URI = " \
30SRC_URI_append_libc-musl = " \ 30SRC_URI_append_libc-musl = " \
31 file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ 31 file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
32 file://musl/0002-Fix-build-with-musl.patch \ 32 file://musl/0002-Fix-build-with-musl.patch \
33 file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
34 file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
33" 35"
34SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d" 36SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
35SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e" 37SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
36 38
37S = "${WORKDIR}/NetworkManager-${PV}" 39S = "${WORKDIR}/NetworkManager-${PV}"
38 40
@@ -65,7 +67,7 @@ PACKAGECONFIG[systemd] = " \
65 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ 67 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
66 --without-systemdsystemunitdir, \ 68 --without-systemdsystemunitdir, \
67" 69"
68PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" 70PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
69PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" 71PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
70# consolekit is not picked by shlibs, so add it to RDEPENDS too 72# consolekit is not picked by shlibs, so add it to RDEPENDS too
71PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" 73PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
@@ -75,33 +77,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
75PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" 77PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
76PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" 78PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
77PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" 79PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
78PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
79PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" 80PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
80PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" 81PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
81PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" 82PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant"
82PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" 83PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
83PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" 84PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
85PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
84 86
85PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ 87PACKAGES =+ " \
86 ${PN}-nmtui ${PN}-nmtui-doc \ 88 ${PN}-nmtui ${PN}-nmtui-doc \
87 ${PN}-adsl \ 89 ${PN}-adsl ${PN}-cloud-setup \
88" 90"
89 91
90FILES_libnmutil += "${libdir}/libnm-util.so.*" 92SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
91FILES_libnmglib += "${libdir}/libnm-glib.so.*"
92FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
93 93
94FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" 94FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
95 95
96FILES_${PN}-cloud-setup = " \
97 ${libexecdir}/nm-cloud-setup \
98 ${systemd_system_unitdir}/nm-cloud-setup.service \
99 ${systemd_system_unitdir}/nm-cloud-setup.timer \
100 ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
101 ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
102"
103ALLOW_EMPTY_${PN}-cloud-setup = "1"
104SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
105
96FILES_${PN} += " \ 106FILES_${PN} += " \
97 ${libexecdir} \ 107 ${libexecdir} \
98 ${libdir}/NetworkManager/${PV}/*.so \ 108 ${libdir}/NetworkManager/${PV}/*.so \
99 ${nonarch_libdir}/NetworkManager/VPN \ 109 ${libdir}/NetworkManager \
100 ${nonarch_libdir}/NetworkManager/conf.d \ 110 ${nonarch_libdir}/NetworkManager/conf.d \
111 ${nonarch_libdir}/NetworkManager/dispatcher.d \
112 ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
113 ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
114 ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
115 ${nonarch_libdir}/NetworkManager/VPN \
116 ${nonarch_libdir}/NetworkManager/system-connections \
101 ${datadir}/polkit-1 \ 117 ${datadir}/polkit-1 \
102 ${datadir}/dbus-1 \ 118 ${datadir}/dbus-1 \
103 ${nonarch_base_libdir}/udev/* \ 119 ${nonarch_base_libdir}/udev/* \
104 ${systemd_unitdir}/system \ 120 ${systemd_system_unitdir} \
105 ${libdir}/pppd \ 121 ${libdir}/pppd \
106" 122"
107 123
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-19 09:30:09 +0000