mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-07 19:52:11 +01:00
sys-apps/iproute2: Sync with Gentoo
It's from Gentoo commit 2c49e8a4568dace61bfc520a4dcab205553584d7. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
841f729aa5
commit
54a1ab8ff1
32
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-6.17.0-musl.patch
vendored
Normal file
32
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-6.17.0-musl.patch
vendored
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
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>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
else
|
else
|
||||||
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
|
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DESCRIPTION="kernel routing and traffic control utilities"
|
DESCRIPTION="kernel routing and traffic control utilities"
|
||||||
@ -47,6 +47,7 @@ BDEPEND="
|
|||||||
"
|
"
|
||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-6.17.0-musl.patch # bug #963708
|
||||||
"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
|
"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
|
||||||
"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
|
"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
|
||||||
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
|
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user