summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-01-03 11:45:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-04 12:34:03 +0000
commit84287daee01e5f8661dbf5098f4eb2f4d0b1b959 (patch)
tree995ca64dca985f19e82752afa847e3570b5b3e72 /meta/recipes-connectivity
parent0b39822e4c429f810916df43b974b0d78a9b6450 (diff)
downloadpoky-84287daee01e5f8661dbf5098f4eb2f4d0b1b959.tar.gz
iproute2: update 6.11.0 -> 6.12.0
(From OE-Core rev: f8c665ca16bf643039bd3f0a918ea9cf9d1a3726) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch90
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch76
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch59
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb)8
5 files changed, 93 insertions, 142 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
index 555d63b240..03af400ecd 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
@@ -1,4 +1,4 @@
1From f3c574b27000fd887cee84ab47adf23f767cbea1 Mon Sep 17 00:00:00 2001 1From 4dc0613e229f6b4a57beb00dde14ef319a2dcad8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Sat, 24 Aug 2024 15:32:25 +0200 3Date: Sat, 24 Aug 2024 15:32:25 +0200
4Subject: [PATCH] include/libnetlink.h: add missing include for htobe64 4Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch
new file mode 100644
index 0000000000..2f77910614
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch
@@ -0,0 +1,90 @@
1From 714291a63246cb3e6b86eb2a78fa84216d768a4b Mon Sep 17 00:00:00 2001
2From: Stephen Hemminger <stephen@networkplumber.org>
3Date: Tue, 10 Dec 2024 13:38:08 -0800
4Subject: [PATCH] ip: rearrange and prune header files
5
6The recent report of issues with missing limits.h impacting musl
7suggested looking at what files are and are not included in ip code.
8
9The standard practice is to put standard headers first, then system,
10then local headers. Used iwyu to get suggestions about missing
11and extraneous headers.
12
13Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=7e23da91fca6e5dedeb32a7d308cf20982e897c3]
14Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
15Signed-off-by: Alexander Kanavin <alex@linutronix.de>
16---
17 ip/iplink.c | 13 +++++--------
18 ip/ipnetns.c | 19 +++++++++----------
19 2 files changed, 14 insertions(+), 18 deletions(-)
20
21diff --git a/ip/iplink.c b/ip/iplink.c
22index e650a5c2..8df367ed 100644
23--- a/ip/iplink.c
24+++ b/ip/iplink.c
25@@ -11,17 +11,14 @@
26 #include <fcntl.h>
27 #include <dlfcn.h>
28 #include <errno.h>
29+#include <string.h>
30+#include <strings.h>
31+#include <limits.h>
32+
33 #include <sys/socket.h>
34+#include <arpa/inet.h>
35 #include <linux/if.h>
36-#include <linux/if_packet.h>
37 #include <linux/if_ether.h>
38-#include <linux/sockios.h>
39-#include <netinet/in.h>
40-#include <arpa/inet.h>
41-#include <string.h>
42-#include <sys/ioctl.h>
43-#include <stdbool.h>
44-#include <linux/mpls.h>
45
46 #include "rt_names.h"
47 #include "utils.h"
48diff --git a/ip/ipnetns.c b/ip/ipnetns.c
49index 5c943400..a20cd8bc 100644
50--- a/ip/ipnetns.c
51+++ b/ip/ipnetns.c
52@@ -1,21 +1,21 @@
53 /* SPDX-License-Identifier: GPL-2.0 */
54 #define _ATFILE_SOURCE
55-#include <sys/file.h>
56-#include <sys/types.h>
57-#include <sys/stat.h>
58-#include <sys/wait.h>
59-#include <sys/inotify.h>
60-#include <sys/mount.h>
61-#include <sys/syscall.h>
62+
63 #include <stdio.h>
64+#include <stdint.h>
65 #include <string.h>
66-#include <sched.h>
67 #include <fcntl.h>
68 #include <dirent.h>
69 #include <errno.h>
70 #include <unistd.h>
71 #include <ctype.h>
72-#include <linux/limits.h>
73+#include <limits.h>
74+
75+#include <sys/file.h>
76+#include <sys/types.h>
77+#include <sys/stat.h>
78+#include <sys/inotify.h>
79+#include <sys/mount.h>
80
81 #include <linux/net_namespace.h>
82
83@@ -23,7 +23,6 @@
84 #include "list.h"
85 #include "ip_common.h"
86 #include "namespace.h"
87-#include "json_print.h"
88
89 static int usage(void)
90 {
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch b/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch
deleted file mode 100644
index 3e266b9298..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From 6a77abab92516e65f07f8657fc4e384c4541ce0e Mon Sep 17 00:00:00 2001
2From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
3Date: Sun, 22 Sep 2024 16:50:10 +0200
4Subject: [PATCH] bridge: mst: fix a musl build issue
5
6This patch fixes a compilation error raised by the bump to version 6.11.0
7in Buildroot using musl as the C library for the cross-compilation
8toolchain.
9
10After setting the CFLGAS
11
12ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
13IPROUTE2_CFLAGS += -D__UAPI_DEF_IN6_ADDR=0 -D__UAPI_DEF_SOCKADDR_IN6=0 \
14 -D__UAPI_DEF_IPV6_MREQ=0
15endif
16
17to fix the following errors:
18
19In file included from ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/arpa/inet.h:9,
20 from ../include/libnetlink.h:14,
21 from mst.c:10:
22../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr'
23 23 | struct in6_addr {
24 | ^~~~~~~~
25In file included from ../include/uapi/linux/if_bridge.h:19,
26 from mst.c:7:
27../include/uapi/linux/in6.h:33:8: note: originally defined here
28 33 | struct in6_addr {
29 | ^~~~~~~~
30../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6'
31 34 | struct sockaddr_in6 {
32 | ^~~~~~~~~~~~
33../include/uapi/linux/in6.h:50:8: note: originally defined here
34 50 | struct sockaddr_in6 {
35 | ^~~~~~~~~~~~
36../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq'
37 42 | struct ipv6_mreq {
38 | ^~~~~~~~~
39../include/uapi/linux/in6.h:60:8: note: originally defined here
40 60 | struct ipv6_mreq {
41
42I got this further errors
43
44../include/uapi/linux/in6.h:72:25: error: field 'flr_dst' has incomplete type
45 72 | struct in6_addr flr_dst;
46 | ^~~~~~~
47../include/uapi/linux/if_bridge.h:711:41: error: field 'ip6' has incomplete type
48 711 | struct in6_addr ip6;
49 | ^~~
50
51fixed by including the netinet/in.h header.
52
53Upstream-Status: Backport
54[https://kernel.googlesource.com/pub/scm/network/iproute2/iproute2/+/6a77abab92516e65f07f8657fc4e384c4541ce0e]
55
56Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
57Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
58---
59 bridge/mst.c | 1 +
60 1 file changed, 1 insertion(+)
61
62diff --git a/bridge/mst.c b/bridge/mst.c
63index 873ca536..c8f7e660 100644
64--- a/bridge/mst.c
65+++ b/bridge/mst.c
66@@ -4,6 +4,7 @@
67 */
68
69 #include <stdio.h>
70+#include <netinet/in.h>
71 #include <linux/if_bridge.h>
72 #include <net/if.h>
73
74--
752.39.5 (Apple Git-154)
76
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch b/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch
deleted file mode 100644
index 6a30f6dcf8..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 043ef90e2fa94397eb5c85330889ca4146a6d58a Mon Sep 17 00:00:00 2001
2From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
3Date: Sun, 22 Sep 2024 16:50:11 +0200
4Subject: [PATCH] bridge: mst: fix a further musl build issue
5
6This patch fixes the following build errors:
7
8In file included from mst.c:11:
9../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
10 80 | _PRINT_FUNC(tv, const struct timeval *)
11 | ^~~~~~~
12../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC'
13 50 | type value); \
14 | ^~~~
15../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
16 80 | _PRINT_FUNC(tv, const struct timeval *)
17 | ^~~~~~~
18../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC'
19 55 | type value) \
20 | ^~~~
21../include/json_print.h: In function 'print_tv':
22../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types]
23 58 | value); \
24 | ^~~~~
25 | |
26 | const struct timeval *
27../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC'
28 80 | _PRINT_FUNC(tv, const struct timeval *)
29 | ^~~~~~~~~~~
30../include/json_print.h:50:42: note: expected 'const struct timeval *' but argument is of type 'const struct timeval *'
31 50 | type value); \
32 | ^
33../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC'
34 80 | _PRINT_FUNC(tv, const struct timeval *)
35
36Upstream-Status: Backport
37[https://kernel.googlesource.com/pub/scm/network/iproute2/iproute2/+/043ef90e2fa94397eb5c85330889ca4146a6d58a]
38
39Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
40Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
41---
42 bridge/mst.c | 1 +
43 1 file changed, 1 insertion(+)
44
45diff --git a/bridge/mst.c b/bridge/mst.c
46index c8f7e660..fccb7fd6 100644
47--- a/bridge/mst.c
48+++ b/bridge/mst.c
49@@ -4,6 +4,7 @@
50 */
51
52 #include <stdio.h>
53+#include <sys/time.h>
54 #include <netinet/in.h>
55 #include <linux/if_bridge.h>
56 #include <net/if.h>
57--
582.39.5 (Apple Git-154)
59
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb
index 652484a94d..741d54799d 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb
@@ -13,14 +13,10 @@ DEPENDS = "flex-native bison-native iptables libcap"
13 13
14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ 14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
15 file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \ 15 file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \
16 file://0001-ip-rearrange-and-prune-header-files.patch \
16 " 17 "
17 18
18SRC_URI:append:libc-musl = "\ 19SRC_URI[sha256sum] = "bbd141ef7b5d0127cc2152843ba61f274dc32814fa3e0f13e7d07a080bef53d9"
19 file://0002-bridge-mst-fix-a-musl-build-issue.patch \
20 file://0003-bridge-mst-fix-a-further-musl-build-issue.patch \
21 "
22
23SRC_URI[sha256sum] = "1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3"
24 20
25inherit update-alternatives bash-completion pkgconfig 21inherit update-alternatives bash-completion pkgconfig
26 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-10 10:51:05 +0000