mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-09 09:41:56 +01:00
sys-apps/iproute2: Sync with Gentoo
It's from Gentoo commit ca57f346afd5828d89feebbe9be741abfc9739b0. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
efeeb1e908
commit
c3fa3f85dc
@ -1,3 +1,3 @@
|
||||
DIST iproute2-6.15.0.tar.xz 930908 BLAKE2B 50247f293e194601bd138418e55e2dc63421d2a5da863973e9ff78f2c76ba051350523559f2b7b7983af05a827f292135353adbf6c857ea32b7071f69940f73f SHA512 1a438941cd939e1c8e32cfe8c40e6fd826c89185f1bb0c623eaad7380a66afd9fa9e0d7cdc5e5b193d2761b7dbdc78fd0811537eecc500be633730c32ff55ad4
|
||||
DIST iproute2-6.16.0.tar.xz 931124 BLAKE2B d1c66f4d63edd6fa2701c92dbc47f8c4388d6a660d541d528e3463e8e261fda64df4a7f8930f510718c71ee82438b5c4859f072eb08c8ff1e4d1d65223108005 SHA512 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df
|
||||
DIST iproute2-6.17.0.tar.xz 940952 BLAKE2B 49b88fd1eaea34376b086be02e72505ca62f52f3c53f3ee29cd273532521fabe8d38062277852dcc69f78b86b9460b213bbeedc9c51ce20d3bb1fd35d86b6fc8 SHA512 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77
|
||||
DIST iproute2-6.18.0.tar.xz 945200 BLAKE2B 03af6c56beb8717f1d2ce77d91db1293188a45ed6b491924c37a6d7956da1b92106198503fc27dc12301648c2c0c5358883ce0fff046fb53e6e8be004696d6fd SHA512 c4a0852fbf0143b51a65adb6a29cbc838ecaed88b827574ea33ddd2e3f90c00732eaea06ff702a7122d82f7e4d926282f9fbb59b87e41be7da04403c73258fc2
|
||||
|
||||
41
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-6.18.0-musl.patch
vendored
Normal file
41
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-6.18.0-musl.patch
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
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>
|
||||
---
|
||||
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
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
diff '--color=auto' -Naur iproute2-6.18.0/netshaper/Makefile iproute2-6.18.0-fix/netshaper/Makefile
|
||||
--- iproute2-6.18.0/netshaper/Makefile 2025-12-01 19:47:16.000000000 +0300
|
||||
+++ iproute2-6.18.0-fix/netshaper/Makefile 2025-12-18 11:26:23.091330554 +0300
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
NSOBJ = netshaper.o
|
||||
TARGETS += netshaper
|
||||
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
inherit git-r3
|
||||
else
|
||||
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
|
||||
|
||||
DESCRIPTION="kernel routing and traffic control utilities"
|
||||
@ -51,6 +51,8 @@ PATCHES=(
|
||||
"${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-disable-libbsd-fallback.patch # bug #911727
|
||||
"${FILESDIR}"/${PN}-6.18.0-netshaper.patch # bug #967691
|
||||
"${FILESDIR}"/${PN}-6.18.0-musl.patch # bug #967701
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
@ -88,6 +90,9 @@ src_configure() {
|
||||
tc-export AR CC PKG_CONFIG
|
||||
lto-guarantee-fat
|
||||
|
||||
tc-export_build_env
|
||||
export CBUILD_CFLAGS=${BUILD_CFLAGS}
|
||||
|
||||
# This sure is ugly. Should probably move into toolchain-funcs at some point.
|
||||
local setns
|
||||
pushd "${T}" >/dev/null || die
|
||||
Loading…
x
Reference in New Issue
Block a user