Skip to contentSkip to conversation

iproute2 upgrade and updates

PATCH New Jaipaul Cheernam 1 participant 4 messages Oct 21

lore
Share & tools
lore
#0 lore raw

cover iproute2 upgrade and updates

Jaipaul Cheernam (3):
iproute2: upgrade 7.2.0 -> 7.3.0
iproute2: drop color.h musl patch
iproute2: drop obsolete GCC-14 musl workaround

 ...nk.h-add-missing-include-for-htobe64.patch | 24 ------------------
 ...olor.h-add-missing-include-for-types.patch | 25 -------------------
 .../{iproute2_7.2.0.bb => iproute2_7.3.0.bb}  |  6 +----
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_7.2.0.bb => iproute2_7.3.0.bb} (91%)
#1 lore raw

PATCH 1/3 iproute2: upgrade 7.2.0 -> 7.3.0

git log --oneline v7.2.0..v7.3.0
19d1276f (HEAD -> main, tag: v7.3.0, origin/main, origin/HEAD) v7.3.0 4f49441d testsuite: add bond slave LACP port state test 075f1b6f testsuite: fix test_on_not on multi-line output 0067cbc8 iplink_bond_slave: read ad_partner_oper_port_state as u16 e11870d5 lib: fix leak on realloc() failure
fde561a2 lib: fix memory leak in getcmdline()
a954ab5a ip: remove redundant human-readable option match ac0b6729 uapi: update magic.h
e6471d77 man: ip-route: document uid parameter for route get 37921dc5 man: ip-route: document tcp_usec_ts route feature 873daf67 u32: fix IPv6 port match pretty printing
8016d5a1 ss: fix vsock port filter
e82aa16e ss: widen sockstat lport/rport to long
4766edf1 iplink/can: fix format string warnings
21a61425 tc/f_u32: fix const strchr() warning
5faf18f6 lib: fix warning from ll_addr_a2n
9361f61a json_print: fix Gcc-17 warnings
c5551426 uapi: update from 7.3 merge
fce739fa Merge remote-tracking branch 'main' into next 30365d09 ip/bond: add lacp_strict support
9204c0f6 Merge remote-tracking branch 'main' into next ad2b2d95 ip nexthop: support fdb destination port
68f2b2cc Update kernel headers
b8cdda55 ipmaddr: use RTM_GETMULTICAST to list multicast addresses ce0464ea seg6: man: document the lookup attribute for SRv6 encap routes 144c45b6 seg6: add support for lookup attribute in SRv6 encap routes 9b464a11 Update kernel headers
35a23709 rdma: display resource limits in curr/max format 39eb3a40 rdma: update uapi headers
20e860c6 ip: display DPLL pin information in link details 37c491d8 devlink: support u64-array values in devlink param show/set 32e2a883 devlink: use DEVLINK_VAR_ATTR_TYPE_* in param show/set 41b13849 Update kernel headers
3c0b939e ss: stop displaying dccp sockets
92f89d0e ip: add OVPN device mode support

- Refresh exsiting patch
- Drop 0001-include-libnetlink.h-add-missing-include-for-htobe64.patch Upstream change was been part of release since v6.13.0 but in different line

---
 ...nk.h-add-missing-include-for-htobe64.patch | 24 -------------------
 .../{iproute2_7.2.0.bb => iproute2_7.3.0.bb}  |  3 +--
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_7.2.0.bb => iproute2_7.3.0.bb} (95%)
meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch deleted +0 -24
deleted file mode 100644
index ececd00539a..00000000000
@@ -1,24 +0,0 @@
-From 61a0f63cd424b2e521b8b2e190c98271ced98de6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Sat, 24 Aug 2024 15:32:25 +0200
-Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
- definitions
-
-Upstream-Status: Submitted [by email to [email protected] [email protected]]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- include/libnetlink.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/libnetlink.h b/include/libnetlink.h
-index e91505d..938bb40 100644
---- a/include/libnetlink.h
-+++ b/include/libnetlink.h
-@@ -13,6 +13,7 @@
- #include <linux/neighbour.h>
- #include <linux/netconf.h>
- #include <arpa/inet.h>
-+#include <endian.h>
- 
- struct rtnl_handle {
- 	int			fd;
meta/recipes-connectivity/iproute2/iproute2_7.3.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_7.2.0.bb +1 -2
similarity index 95%
rename from meta/recipes-connectivity/iproute2/iproute2_7.2.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_7.3.0.bb
index aef70579468..63bdd78a7d7 100644
@@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 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-include-color.h-add-missing-include-for-types.patch \
            "
 
-SRC_URI[sha256sum] = "4c2fa124c2cf0afd7ca34d1eeacba6ba048a56f6374e2aab93dafbdbd4eea9c0"
+SRC_URI[sha256sum] = "5c1789d290bba048a6135ed1ab81b0402dd0fb528d1f1421765c42b1fc3d6289"
 
 inherit update-alternatives bash-completion pkgconfig
 
#2 lore raw

PATCH 2/3 iproute2: drop color.h musl patch

In reply to Jaipaul Cheernam

- The patch added <linux/types.h> to color.h so __u8 would resolve under musl. In 7.3.0 everything that includes color.h already pulls in a header that defines __u8 first, so it builds fine without the patch now.
It was only submitted upstream, never merged, so nothing was lost by dropping it

---
 ...olor.h-add-missing-include-for-types.patch | 25 -------------------
 .../iproute2/iproute2_7.3.0.bb                |  1 -
 2 files changed, 26 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch
meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch deleted +0 -25
deleted file mode 100644
index 5ed8335be7e..00000000000
@@ -1,25 +0,0 @@
-From 7dc5b9726cdf214835c62967f7dcb8ceb660ece7 Mon Sep 17 00:00:00 2001
-From: Andrej Kozemcak <[email protected]>
-Date: Thu, 5 Mar 2026 08:06:54 +0100
-Subject: [PATCH] include/color.h: add missing include for types
-
-Fix `musl` build error
-
-Upstream-Status: Submitted [https://lore.kernel.org/netdev/[email protected]/T/#u]
-Signed-off-by: Andrej Kozemcak <[email protected]>
----
- include/color.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/color.h b/include/color.h
-index b543c26..3794a2a 100644
---- a/include/color.h
-+++ b/include/color.h
-@@ -3,6 +3,7 @@
- #define __COLOR_H__ 1
- 
- #include <stdbool.h>
-+#include <linux/types.h>
- 
- enum color_attr {
- 	COLOR_IFNAME,
meta/recipes-connectivity/iproute2/iproute2_7.3.0.bb +0 -1
index 63bdd78a7d7..685fb3ce9aa 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 DEPENDS = "flex-native bison-native libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
-           file://0002-include-color.h-add-missing-include-for-types.patch \
            "
 
 SRC_URI[sha256sum] = "5c1789d290bba048a6135ed1ab81b0402dd0fb528d1f1421765c42b1fc3d6289"
#3 lore raw

PATCH 3/3 iproute2: drop obsolete GCC-14 musl workaround

In reply to Jaipaul Cheernam

- The -Wno-error=incompatible-pointer-types flag was added to work around a GCC-14 build error on musl. With the current toolchain (GCC 16) iproute2 7.3.0 builds cleanly for musl without it, so drop it.

---
 meta/recipes-connectivity/iproute2/iproute2_7.3.0.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-connectivity/iproute2/iproute2_7.3.0.bb +0 -2
index 685fb3ce9aa..fb11b5dd042 100644
@@ -30,8 +30,6 @@ PACKAGECONFIG[dpll] = ",,libmnl,"
 
 IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma dcb dpll', d)}"
 
-# This is needed with GCC-14 and musl
-CFLAGS += "-Wno-error=incompatible-pointer-types"
 # CFLAGS are computed in Makefile and reference CCOPTS
 #
 EXTRA_OEMAKE = "\