mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/iproute2: add upstream patch to fix musl/uclibc build
Buildroot commit 532d5561f4 bumped
iproute2 to version 6.17.0 which added lib/bridge.c:
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/lib/bridge.c?h=v6.17.0
and causes build errors on musl & uclibc toolchains.
Added upstream patch to fix the problem.
Fixes:
https://autobuild.buildroot.net/results/951/951e4198b2ba109fd9c746fe2e6316a29085aeeb/
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
0964bf05e9
commit
0629bcfc7e
@@ -0,0 +1,36 @@
|
|||||||
|
From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yureka <yureka@cyberchaos.dev>
|
||||||
|
Date: Sun, 12 Oct 2025 14:39:47 +0200
|
||||||
|
Subject: 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>
|
||||||
|
|
||||||
|
Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=7119f3736f689ab396ca4193ac593938affd55fa
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||||
|
---
|
||||||
|
lib/bridge.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/bridge.c b/lib/bridge.c
|
||||||
|
index 5386aa017..104f5858b 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)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
cgit 1.2.3-korg
|
||||||
|
|
||||||
Reference in New Issue
Block a user