diff mbox series

[023/114] iproute2: upgrade 6.17.0 -> 6.18.0

Message ID 20251222200739.2278706-23-alex.kanavin@gmail.com
State New
Headers show
Series [001/114] build-appliance-image: do not inherit setuptools | expand

Commit Message

Alexander Kanavin Dec. 22, 2025, 8:06 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Backport a musl fix.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...nk.h-add-missing-include-for-htobe64.patch |  2 +-
 ...ridge-avoid-redefinition-of-in6_addr.patch | 34 ---------------
 .../iproute2/iproute2/fix-musl.patch          | 43 +++++++++++++++++++
 ...{iproute2_6.17.0.bb => iproute2_6.18.0.bb} |  4 +-
 4 files changed, 46 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2/fix-musl.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_6.17.0.bb => iproute2_6.18.0.bb} (95%)
diff mbox series

Patch

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 c4dea39676..614cd00499 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 @@ 
-From 9e427aa1c647f741b08a1f0c44483ea974c7fc61 Mon Sep 17 00:00:00 2001
+From 228a051a53a4e6b1ca2640932cb78a23e44454a8 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sat, 24 Aug 2024 15:32:25 +0200
 Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch b/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch
deleted file mode 100644
index 5315358024..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From ad944bd173cacc098f224e7db7248d7210821fca Mon Sep 17 00:00:00 2001
-From: Yureka <yureka@cyberchaos.dev>
-Date: Sun, 12 Oct 2025 14:39:47 +0200
-Subject: [PATCH] lib: bridge: avoid redefinition of in6_addr
-
-On musl libc, which does not use the kernel definitions of in6_addr, including
-the libc headers after the kernel (UAPI) headers would cause a redefinition
-error. The opposite order avoids the redefinition.
-
-Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a
-Signed-off-by: Yureka <yureka@cyberchaos.dev>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=25b2834cc974729229afcd308f127995405f85c5]
-(cherry picked from commit 25b2834cc974729229afcd308f127995405f85c5)
-Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
----
- lib/bridge.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/bridge.c b/lib/bridge.c
-index 5386aa01..104f5858 100644
---- a/lib/bridge.c
-+++ b/lib/bridge.c
-@@ -2,8 +2,8 @@
- 
- #include <net/if.h>
- 
--#include "bridge.h"
- #include "utils.h"
-+#include "bridge.h"
- 
- void bridge_print_vlan_flags(__u16 flags)
- {
diff --git a/meta/recipes-connectivity/iproute2/iproute2/fix-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/fix-musl.patch
new file mode 100644
index 0000000000..20907dad50
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/fix-musl.patch
@@ -0,0 +1,43 @@ 
+From 6c1113633fde51b0e60f02243cfad1b3d09762cc Mon Sep 17 00:00:00 2001
+From: Akhilesh Nema <nemaakhilesh@gmail.com>
+Date: Tue, 2 Dec 2025 18:11:24 -0800
+Subject: fix 'UINT_MAX' undeclared with build with musl libc
+
+- utils_math.c:136:20: error: 'UINT_MAX' undeclared (first use in this function)
+- tc_core.c:51:22: error: 'UINT_MAX' undeclared (first use in this function)
+
+Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com>
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=6c1113633fde51b0e60f02243cfad1b3d09762cc]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ lib/utils_math.c | 1 +
+ tc/tc_core.c     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/utils_math.c b/lib/utils_math.c
+index a7e747440..fd2ddc7c7 100644
+--- a/lib/utils_math.c
++++ b/lib/utils_math.c
+@@ -4,6 +4,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
++#include <limits.h>
+ #include <asm/types.h>
+ 
+ #include "utils.h"
+diff --git a/tc/tc_core.c b/tc/tc_core.c
+index a422e02c8..b13b7d78a 100644
+--- a/tc/tc_core.c
++++ b/tc/tc_core.c
+@@ -11,6 +11,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <math.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-- 
+cgit 1.2.3-korg
+
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.18.0.bb
similarity index 95%
rename from meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_6.18.0.bb
index 8840e4ba89..e078bcf3a9 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.18.0.bb
@@ -13,10 +13,10 @@  DEPENDS = "flex-native bison-native libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
            file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \
-           file://0002-lib-bridge-avoid-redefinition-of-in6_addr.patch \
+           file://fix-musl.patch \
            "
 
-SRC_URI[sha256sum] = "9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec"
+SRC_URI[sha256sum] = "6ba520e1975e4c50dc931eeae91ea37c198b8a173744885f8895b84325f9d456"
 
 inherit update-alternatives bash-completion pkgconfig