summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorVinicius Aquino <voa.aquino@gmail.com>2021-04-07 16:25:00 -0300
committerArmin Kuster <akuster808@gmail.com>2021-04-08 13:13:29 -0700
commitefadc8a79e15fb82be2b92857459e590eed71aa3 (patch)
treee769cee7d6fc4f739d25d4d95d56681a4d7321cd /meta-networking
parent84c73f49aa2bb6e5f5ec4deb0bfb0160d4c53ea6 (diff)
downloadmeta-openembedded-efadc8a79e15fb82be2b92857459e590eed71aa3.tar.gz
networkmanager: upgrade 1.28.0 -> 1.30.2
Upgrade to release 1.30.2: - 0004-fix_reallocarray_check.patch removed because the current version of nm already includes boths malloc.h and stdlib.h - musl/0002-Fix-build-with-musl.patch removed because the commit c50da167bc of nm solves the build issue with musl - musl/0001-Fix-build-with-musl-systemd-specific.patch modified to avoid conflicts when applied to current version of nm - musl/0003-Fix-build-with-musl-systemd-specific.patch renamed to musl/0002-Fix-build-with-musl-systemd-specific.patch and modified to avoid conflicts when applied to current version of nm Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 12a241278aec8893d65dc6fa8d045b0bac0220ea) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch50
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch27
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch52
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch26
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch121
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch26
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb (renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb)6
7 files changed, 59 insertions, 249 deletions
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 ecd13504d3..0a86abafc0 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,34 +1,29 @@
1From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 1From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: Vinicius Aquino <voa.aquino@gmail.com>
3Date: Sat, 16 Jan 2021 14:27:38 +0100 3Date: Thu, 1 Apr 2021 14:13:07 -0300
4Subject: [PATCH] Do not create settings settings/property documentation 4Subject: [PATCH] Do not create settings settings/property documentation
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
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
14It was tried to get this work by adding python3-pygobject-native to DEPENDS but 9It was tried to get this work by adding python3-pygobject-native to DEPENDS but
15compile could not find (configure passed) python module gi. 10compile could not find (configure passed) python module gi.
16Anyway it is not necessary for us to have the settings/property docs. 11Anyway it is not necessary for us to have the settings/property docs.
17 12
18Upstream-Status: Inappropriate [OE specific] 13Upstream-Status: Inappropriate [OE specific]
19 14
20Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 15Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
21 16Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
22--- 17---
23 Makefile.am | 13 ------------- 18 Makefile.am | 4 ----
24 configure.ac | 5 ----- 19 configure.ac | 5 -----
25 2 files changed, 18 deletions(-) 20 2 files changed, 9 deletions(-)
26 21
27diff --git a/Makefile.am b/Makefile.am 22diff --git a/Makefile.am b/Makefile.am
28index 110957a..b4cfbcc 100644 23index 9279672c1..2e52acbb2 100644
29--- a/Makefile.am 24--- a/Makefile.am
30+++ b/Makefile.am 25+++ b/Makefile.am
31@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir 26@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir
32 INTROSPECTION_GIRS += libnm/NM-1.0.gir 27 INTROSPECTION_GIRS += libnm/NM-1.0.gir
33 28
34 libnm_noinst_data = \ 29 libnm_noinst_data = \
@@ -43,30 +38,11 @@ index 110957a..b4cfbcc 100644
43 $(NULL) 38 $(NULL)
44 39
45 noinst_DATA += $(libnm_noinst_data) 40 noinst_DATA += $(libnm_noinst_data)
46@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
47 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
48
49 clients_common_settings_doc_h = clients/common/settings-docs.h
50-if HAVE_INTROSPECTION
51-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
52- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
53-DISTCLEANFILES += $(clients_common_settings_doc_h)
54-check-local-settings-docs: $(clients_common_settings_doc_h)
55- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
56-check_local += check-local-settings-docs
57-else
58 $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
59 $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
60 check-local-settings-docs:
61-endif
62 EXTRA_DIST += \
63 $(clients_common_settings_doc_h) \
64 $(clients_common_settings_doc_h).in
65diff --git a/configure.ac b/configure.ac 41diff --git a/configure.ac b/configure.ac
66index 704b1c1..18bba87 100644 42index 784ac4695..681e6cb32 100644
67--- a/configure.ac 43--- a/configure.ac
68+++ b/configure.ac 44+++ b/configure.ac
69@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0) 45@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0)
70 # check if we can build setting property documentation 46 # check if we can build setting property documentation
71 build_docs=no 47 build_docs=no
72 if test -n "$INTROSPECTION_MAKEFILE"; then 48 if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -79,5 +55,5 @@ index 704b1c1..18bba87 100644
79 if test -z "$PERL"; then 55 if test -z "$PERL"; then
80 AC_MSG_ERROR([--enable-introspection requires perl]) 56 AC_MSG_ERROR([--enable-introspection requires perl])
81-- 57--
822.26.2 582.20.1
83 59
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
deleted file mode 100644
index 2df449f2eb..0000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1reallocarray() is coming from stdlib.h which maybe indirectly included
2by malloc.h but not on all libc implementations
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6--- a/meson.build
7+++ b/meson.build
8@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys
9 #include <sys/wait.h>'''))
10 config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
11 config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
12-config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>'))
13+config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <stdlib.h>'))
14 config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include <string.h>'))
15 config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>'))
16
17--- a/configure.ac
18+++ b/configure.ac
19@@ -82,7 +82,7 @@ AC_CHECK_DECLS([
20 AC_CHECK_DECLS([
21 reallocarray],
22 [], [], [[
23-#include <malloc.h>
24+#include <stdlib.h>
25 ]])
26
27 AC_CHECK_DECLS([
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 7807fc77c6..692f1ffa4f 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,12 +1,11 @@
1From 9597122867c22e949ef3b69c779e0facebce6eb5 Mon Sep 17 00:00:00 2001 1From 44884c7e7655b889f41cb02ffc8ab72a29b52ebf 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 1/2] Fix build with musl - systemd specific
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
8 8
9From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
10MIME-Version: 1.0 9MIME-Version: 1.0
11Content-Type: text/plain; charset=UTF-8 10Content-Type: text/plain; charset=UTF-8
12Content-Transfer-Encoding: 8bit 11Content-Transfer-Encoding: 8bit
@@ -17,18 +16,18 @@ for musl.
17Upstream-Status: Pending 16Upstream-Status: Pending
18 17
19Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 18Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
20 19Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
21--- 20---
22 shared/systemd/src/basic/in-addr-util.c | 1 + 21 shared/systemd/src/basic/in-addr-util.c | 1 +
23 shared/systemd/src/basic/process-util.c | 9 +++++++++ 22 shared/systemd/src/basic/process-util.c | 9 +++++++++
24 shared/systemd/src/basic/socket-util.h | 6 ++++++ 23 shared/systemd/src/basic/socket-util.h | 6 ++++++
25 shared/systemd/src/basic/sort-util.h | 27 ++++--------------------- 24 shared/systemd/src/basic/sort-util.h | 13 ++++---------
26 shared/systemd/src/basic/stdio-util.h | 2 ++ 25 shared/systemd/src/basic/stdio-util.h | 2 ++
27 shared/systemd/src/basic/string-util.h | 5 +++++ 26 shared/systemd/src/basic/string-util.h | 5 +++++
28 6 files changed, 27 insertions(+), 23 deletions(-) 27 6 files changed, 27 insertions(+), 9 deletions(-)
29 28
30diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c 29diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
31index 1ea3e7f..1204393 100644 30index c315dcbb8..5b7e04eb7 100644
32--- a/shared/systemd/src/basic/in-addr-util.c 31--- a/shared/systemd/src/basic/in-addr-util.c
33+++ b/shared/systemd/src/basic/in-addr-util.c 32+++ b/shared/systemd/src/basic/in-addr-util.c
34@@ -15,6 +15,7 @@ 33@@ -15,6 +15,7 @@
@@ -40,7 +39,7 @@ index 1ea3e7f..1204393 100644
40 #include "string-util.h" 39 #include "string-util.h"
41 #include "strxcpyx.h" 40 #include "strxcpyx.h"
42diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c 41diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
43index 03ca04e..be8bca8 100644 42index 0e25b0200..ea2c0fbb4 100644
44--- a/shared/systemd/src/basic/process-util.c 43--- a/shared/systemd/src/basic/process-util.c
45+++ b/shared/systemd/src/basic/process-util.c 44+++ b/shared/systemd/src/basic/process-util.c
46@@ -17,6 +17,9 @@ 45@@ -17,6 +17,9 @@
@@ -80,7 +79,7 @@ index 03ca04e..be8bca8 100644
80 cached_pid = CACHED_PID_UNSET; 79 cached_pid = CACHED_PID_UNSET;
81 return new_pid; 80 return new_pid;
82diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h 81diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
83index 1ece911..290e94c 100644 82index 1de069476..f6834fbd2 100644
84--- a/shared/systemd/src/basic/socket-util.h 83--- a/shared/systemd/src/basic/socket-util.h
85+++ b/shared/systemd/src/basic/socket-util.h 84+++ b/shared/systemd/src/basic/socket-util.h
86@@ -14,6 +14,12 @@ 85@@ -14,6 +14,12 @@
@@ -94,10 +93,10 @@ index 1ece911..290e94c 100644
94+#endif 93+#endif
95+ 94+
96 #include "macro.h" 95 #include "macro.h"
96 #include "missing_network.h"
97 #include "missing_socket.h" 97 #include "missing_socket.h"
98 #include "sparse-endian.h"
99diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h 98diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h
100index a8dc3bb..ff0aa88 100644 99index a8984fc16..5fb90f8c5 100644
101--- a/shared/systemd/src/basic/sort-util.h 100--- a/shared/systemd/src/basic/sort-util.h
102+++ b/shared/systemd/src/basic/sort-util.h 101+++ b/shared/systemd/src/basic/sort-util.h
103@@ -5,15 +5,10 @@ 102@@ -5,15 +5,10 @@
@@ -120,40 +119,22 @@ index a8dc3bb..ff0aa88 100644
120 119
121 /** 120 /**
122 * Normal bsearch requires base to be nonnull. Here were require 121 * Normal bsearch requires base to be nonnull. Here were require
123@@ -54,17 +49,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f
124 int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \
125 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
126 })
127-
128-static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) {
129- if (nmemb <= 1)
130- return;
131-
132- assert(base);
133- qsort_r(base, nmemb, size, compar, userdata);
134-}
135-
136-#define typesafe_qsort_r(p, n, func, userdata) \
137- ({ \
138- int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \
139- qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
140- })
141diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h 122diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
142index c3b9448..e80a938 100644 123index d45d3c1a6..fee1a57ca 100644
143--- a/shared/systemd/src/basic/stdio-util.h 124--- a/shared/systemd/src/basic/stdio-util.h
144+++ b/shared/systemd/src/basic/stdio-util.h 125+++ b/shared/systemd/src/basic/stdio-util.h
145@@ -1,7 +1,9 @@ 126@@ -2,7 +2,9 @@
146 /* SPDX-License-Identifier: LGPL-2.1+ */
147 #pragma once 127 #pragma once
148 128
129 #if 0 /* NM_IGNORED */
149+#if defined(__GLIBC__) 130+#if defined(__GLIBC__)
150 #include <printf.h> 131 #include <printf.h>
151+#endif 132+#endif
133 #endif /* NM_IGNORED */
152 #include <stdarg.h> 134 #include <stdarg.h>
153 #include <stdio.h> 135 #include <stdio.h>
154 #include <sys/types.h>
155diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h 136diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
156index cefbda3..71e4dec 100644 137index 593cf04ae..541c393f6 100644
157--- a/shared/systemd/src/basic/string-util.h 138--- a/shared/systemd/src/basic/string-util.h
158+++ b/shared/systemd/src/basic/string-util.h 139+++ b/shared/systemd/src/basic/string-util.h
159@@ -26,6 +26,11 @@ 140@@ -26,6 +26,11 @@
@@ -168,3 +149,6 @@ index cefbda3..71e4dec 100644
168 int strcmp_ptr(const char *a, const char *b) _pure_; 149 int strcmp_ptr(const char *a, const char *b) _pure_;
169 int strcasecmp_ptr(const char *a, const char *b) _pure_; 150 int strcasecmp_ptr(const char *a, const char *b) _pure_;
170 151
152--
1532.20.1
154
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch
new file mode 100644
index 0000000000..d83efd39e4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch
@@ -0,0 +1,26 @@
1From 7d9a11a17da425d106791ada7100d7a6559e6065 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 2/2] Fix build with musl - systemd specific
5
6---
7 src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
8 1 file changed, 2 insertions(+)
9
10diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
11index 3fafd3c0e..79d6096c2 100644
12--- a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
13+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
14@@ -8,7 +8,9 @@
15 #include <errno.h>
16 #include <sys/ioctl.h>
17 #if 0 /* NM_IGNORED */
18+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */
19 #include <linux/if_arp.h>
20+#endif
21 #else /* NM_IGNORED */
22 #include <net/if_arp.h>
23 #endif /* NM_IGNORED */
24--
252.20.1
26
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
deleted file mode 100644
index 0f43c0c684..0000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,121 +0,0 @@
1From bacc14089c80ec757025789ff054a05e1f9c088d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 8 Apr 2019 23:10:43 +0200
4Subject: [PATCH] Fix build with musl
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
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
14The build issues caused by definition conflicts musl vs linux-libc headers
15(error: redefinition of ...) can be reduced to two headers:
16
171. netinet/if_ether.h <-> linux/if_ether.h: linux-libc header plays well with
18 glibc and musl headers in case libc's variant (netinet/if_ether.h) is
19 included BEFORE linux variant [1]. We add include at two positions:
20 1. shared/nm-default.h: This is a global which used for networkmanager and
21 is included at the very beginning of all c-files.
22 2. libnm-core/nm-utils.h: This file makes it into installation and is used
23 by dependent packages as network-manager-applet
242. net/if_arp. <-> linux/if_ether.h: linux-libc: Unfortunaly these files do
25 not play together in harmony. Therefore the libc variant is included early in
26 shared/nm-default.h and occurances linux/if_arp.h are removed.
27
28Note:
29Be aware that this is still nasty business: We have to trust that musl headers
30define same signatures as linux would do - just because musl-makers consider
31linux-libc headers 'notoriously broken for userspace' [2] (search for
32'error: redefinition of').
33
34[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280440.html
35[2] https://wiki.musl-libc.org/faq.html
36
37Upstream-Status: Pending
38
39Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
40
41---
42 clients/tui/nmt-device-entry.c | 1 -
43 libnm-core/nm-utils.h | 4 ++++
44 shared/nm-default.h | 3 +++
45 src/devices/nm-device.c | 2 +-
46 src/platform/nm-linux-platform.c | 1 -
47 5 files changed, 8 insertions(+), 3 deletions(-)
48
49diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
50index 692a467..cf9b32e 100644
51--- a/clients/tui/nmt-device-entry.c
52+++ b/clients/tui/nmt-device-entry.c
53@@ -26,7 +26,6 @@
54 #include "nmt-device-entry.h"
55
56 #include <sys/socket.h>
57-#include <linux/if_arp.h>
58
59 #include "nmtui.h"
60
61diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
62index 9589c51..b82c5cf 100644
63--- a/libnm-core/nm-utils.h
64+++ b/libnm-core/nm-utils.h
65@@ -10,6 +10,10 @@
66 #error "Only <NetworkManager.h> can be included directly."
67 #endif
68
69+/* include as early as possible for musl */
70+#include <netinet/if_ether.h>
71+/* #include <net/if_arp.h> - uncoment for broken dependents?? */
72+
73 #include <glib.h>
74
75 #include <netinet/in.h>
76diff --git a/shared/nm-default.h b/shared/nm-default.h
77index b322f1d..c287dbe 100644
78--- a/shared/nm-default.h
79+++ b/shared/nm-default.h
80@@ -178,6 +178,9 @@
81 #endif
82
83 #include <stdlib.h>
84+/* include as early as possible for musl */
85+#include <netinet/if_ether.h>
86+#include <net/if_arp.h>
87
88 /*****************************************************************************/
89
90diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
91index 0be05f2..04061f9 100644
92--- a/src/devices/nm-device.c
93+++ b/src/devices/nm-device.c
94@@ -9,6 +9,7 @@
95 #include "nm-device.h"
96
97 #include <netinet/in.h>
98+#include <net/if.h>
99 #include <unistd.h>
100 #include <sys/ioctl.h>
101 #include <signal.h>
102@@ -17,7 +18,6 @@
103 #include <arpa/inet.h>
104 #include <fcntl.h>
105 #include <linux/if_addr.h>
106-#include <linux/if_arp.h>
107 #include <linux/rtnetlink.h>
108
109 #include "nm-std-aux/unaligned.h"
110diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
111index b377c85..87af59a 100644
112--- a/src/platform/nm-linux-platform.c
113+++ b/src/platform/nm-linux-platform.c
114@@ -14,7 +14,6 @@
115 #include <libudev.h>
116 #include <linux/fib_rules.h>
117 #include <linux/ip.h>
118-#include <linux/if_arp.h>
119 #include <linux/if_bridge.h>
120 #include <linux/if_link.h>
121 #include <linux/if_tun.h>
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
deleted file mode 100644
index 5735d51a8c..0000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From ed748a28076eada9f38e3f4a476f28d7a10ba84b 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] 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 ec7f1be..31bcd4d 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.28.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
index 7a20e914f1..ec3bdd22bd 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
@@ -26,14 +26,12 @@ SRC_URI = " \
26 file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ 26 file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
27 file://0002-Do-not-create-settings-settings-property-documentati.patch \ 27 file://0002-Do-not-create-settings-settings-property-documentati.patch \
28 file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ 28 file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
29 file://0004-fix_reallocarray_check.patch \
30" 29"
31SRC_URI_append_libc-musl = " \ 30SRC_URI_append_libc-musl = " \
32 file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ 31 file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
33 file://musl/0002-Fix-build-with-musl.patch \ 32 file://musl/0002-Fix-build-with-musl-systemd-specific.patch \
34 file://musl/0003-Fix-build-with-musl-systemd-specific.patch \
35" 33"
36SRC_URI[sha256sum] = "3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062" 34SRC_URI[sha256sum] = "0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2"
37 35
38S = "${WORKDIR}/NetworkManager-${PV}" 36S = "${WORKDIR}/NetworkManager-${PV}"
39 37