diff options
| author | Ankur Tyagi <ankur.tyagi85@gmail.com> | 2025-11-04 17:34:04 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:15:35 +0000 |
| commit | f0d2928201e0ce2191447a20211cb659f792a393 (patch) | |
| tree | 8b5db8bda71d027aed1877f48cbb7402b0be5126 | |
| parent | 0bc53e9068e98c0beb66d1aac278c16e1c03c540 (diff) | |
| download | poky-f0d2928201e0ce2191447a20211cb659f792a393.tar.gz | |
iproute2: upgrade 6.16.0 -> 6.17.0
(From OE-Core rev: 86105f5c04d5a3ccfbe163f70e29e9b073d7f37e)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb) | 3 |
2 files changed, 36 insertions, 1 deletions
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 new file mode 100644 index 0000000000..5315358024 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From ad944bd173cacc098f224e7db7248d7210821fca Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yureka <yureka@cyberchaos.dev> | ||
| 3 | Date: Sun, 12 Oct 2025 14:39:47 +0200 | ||
| 4 | Subject: [PATCH] lib: bridge: avoid redefinition of in6_addr | ||
| 5 | |||
| 6 | On musl libc, which does not use the kernel definitions of in6_addr, including | ||
| 7 | the libc headers after the kernel (UAPI) headers would cause a redefinition | ||
| 8 | error. The opposite order avoids the redefinition. | ||
| 9 | |||
| 10 | Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a | ||
| 11 | Signed-off-by: Yureka <yureka@cyberchaos.dev> | ||
| 12 | Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> | ||
| 13 | |||
| 14 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=25b2834cc974729229afcd308f127995405f85c5] | ||
| 15 | (cherry picked from commit 25b2834cc974729229afcd308f127995405f85c5) | ||
| 16 | Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> | ||
| 17 | --- | ||
| 18 | lib/bridge.c | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/lib/bridge.c b/lib/bridge.c | ||
| 22 | index 5386aa01..104f5858 100644 | ||
| 23 | --- a/lib/bridge.c | ||
| 24 | +++ b/lib/bridge.c | ||
| 25 | @@ -2,8 +2,8 @@ | ||
| 26 | |||
| 27 | #include <net/if.h> | ||
| 28 | |||
| 29 | -#include "bridge.h" | ||
| 30 | #include "utils.h" | ||
| 31 | +#include "bridge.h" | ||
| 32 | |||
| 33 | void bridge_print_vlan_flags(__u16 flags) | ||
| 34 | { | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb index dc7106902c..59e8a7311d 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb | |||
| @@ -13,9 +13,10 @@ DEPENDS = "flex-native bison-native libcap" | |||
| 13 | 13 | ||
| 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 14 | SRC_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://0002-lib-bridge-avoid-redefinition-of-in6_addr.patch \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | SRC_URI[sha256sum] = "5900ccc15f9ac3bf7b7eae81deb5937123df35e99347a7f11a22818482f0a8d0" | 19 | SRC_URI[sha256sum] = "9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec" |
| 19 | 20 | ||
| 20 | inherit update-alternatives bash-completion pkgconfig | 21 | inherit update-alternatives bash-completion pkgconfig |
| 21 | 22 | ||
