mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-23 23:41:10 +02:00
sys-apps/iproute2: Sync with Gentoo
It's from Gentoo commit ffb654585845a1d59b2742514344f01e1f6bbf08.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
c700e57fca
commit
334353c6dd
@ -1,5 +1,3 @@
|
||||
DIST iproute2-6.10.0.tar.xz 920812 BLAKE2B 66332ea333ab2cdc4a2c71000fa2d06fd87cfdf5237dae458aff60ce606155302eb9d0ffaf87107255ab04c02f2b773dc040abb08bb89afb53091396dfc8a3ad SHA512 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41
|
||||
DIST iproute2-6.11.0.tar.xz 923736 BLAKE2B 1a360d7cb9a70f5cde184abe934f2d08e9c0d2196c4ec10015636af3984abe2738d9dd8d6c7a69569fc7449e9933829f4eccd593ab8c041ce7b6385adaed63cc SHA512 06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3
|
||||
DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
|
||||
DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
|
||||
DIST iproute2-6.12.0.tar.xz 925392 BLAKE2B 95aee769662e21c8c6223d09ee0ec365fcdeb7a10d01e89e33aa3039a6dfac11401cbdca4bf436544fc05ed709ad90871ac91eaf17dc553d7ca157b98577a7b7 SHA512 dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2
|
||||
DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- a/devlink/devlink.c
|
||||
+++ b/devlink/devlink.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <unistd.h>
|
||||
+#include <signal.h>
|
||||
#include <getopt.h>
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
@ -0,0 +1,37 @@
|
||||
https://github.com/iproute2/iproute2/pull/71
|
||||
|
||||
From cdc6a1759ea1858d65fdbbfe825999b3d4ed377e Mon Sep 17 00:00:00 2001
|
||||
From: David Seifert <soap@gentoo.org>
|
||||
Date: Sun, 8 Dec 2024 13:19:14 +0100
|
||||
Subject: [PATCH] musl: include <limits.h> for PATH_MAX macro
|
||||
|
||||
https://bugs.gentoo.org/946088
|
||||
---
|
||||
ip/iplink.c | 1 +
|
||||
ip/ipnetns.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/ip/iplink.c b/ip/iplink.c
|
||||
index aa2332fcc..27863b981 100644
|
||||
--- a/ip/iplink.c
|
||||
+++ b/ip/iplink.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <stdbool.h>
|
||||
+#include <limits.h>
|
||||
#include <linux/mpls.h>
|
||||
|
||||
#include "rt_names.h"
|
||||
diff --git a/ip/ipnetns.c b/ip/ipnetns.c
|
||||
index 5c9434009..de16b2790 100644
|
||||
--- a/ip/ipnetns.c
|
||||
+++ b/ip/ipnetns.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
+#include <limits.h>
|
||||
#include <linux/limits.h>
|
||||
|
||||
#include <linux/net_namespace.h>
|
||||
@ -1,25 +0,0 @@
|
||||
|
||||
Disable the optional libbsd fallback in favor of iproute2's own
|
||||
strlcat/strlcpy routines. This prevents automagic linking and
|
||||
all sorts of other related problems.
|
||||
|
||||
Bug: https://bugs.gentoo.org/911727
|
||||
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
|
||||
|
||||
--- a/configure 2023-09-05 16:20:48.000000000 +0200
|
||||
+++ b/configure 2023-09-05 16:29:15.850347415 +0200
|
||||
@@ -454,14 +454,8 @@ EOF
|
||||
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
|
||||
echo "no"
|
||||
else
|
||||
- if ${PKG_CONFIG} libbsd --exists; then
|
||||
- echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
||||
- echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
- echo "no"
|
||||
- else
|
||||
echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
|
||||
echo "yes"
|
||||
- fi
|
||||
fi
|
||||
rm -f $TMPDIR/strtest.c $TMPDIR/strtest
|
||||
}
|
||||
@ -1,246 +0,0 @@
|
||||
The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
|
||||
a variable as well as modifying CFLAGS & LDLIBS.
|
||||
|
||||
If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
|
||||
are still in place.
|
||||
|
||||
Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
|
||||
are only passed when correctly needed.
|
||||
|
||||
Prior Gentoo testcase for reproduction:
|
||||
USE=minimal ebuild ... compile.
|
||||
- Linking with libbsd, libelf, libmnl & libcap based only on presence.
|
||||
- Links based on libselinux based only on presence.
|
||||
|
||||
Closes: https://bugs.gentoo.org/643722
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727
|
||||
by Holger Hoffstätte <holger@applied-asynchrony.com>
|
||||
|
||||
--- a/config.include
|
||||
+++ b/config.include
|
||||
@@ -0,0 +1,26 @@
|
||||
+# We can only modify CFLAGS/LDLIBS after all the config options are known.
|
||||
+ifeq ($(IP_CONFIG_SETNS),y)
|
||||
+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_ELF),y)
|
||||
+ CFLAGS += $(HAVE_ELF_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_ELF_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_SELINUX),y)
|
||||
+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_MNL),y)
|
||||
+ CFLAGS += $(HAVE_MNL_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_MNL_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_CAP),y)
|
||||
+ CFLAGS += $(HAVE_CAP_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_CAP_LDLIBS)
|
||||
+endif
|
||||
+
|
||||
+# Rules can only be declared after all variables in them are known.
|
||||
+%.o: %.c
|
||||
+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
+
|
||||
+# vim: ft=make:
|
||||
|
||||
--- a/bridge/Makefile
|
||||
+++ b/bridge/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
all: bridge
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -202,7 +202,7 @@ EOF
|
||||
if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
|
||||
echo "IP_CONFIG_SETNS:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -269,8 +269,8 @@ check_elf()
|
||||
echo "HAVE_ELF:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -388,8 +388,8 @@ check_selinux()
|
||||
echo "HAVE_SELINUX:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -414,8 +414,8 @@ check_mnl()
|
||||
echo "HAVE_MNL:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -455,8 +455,8 @@ EOF
|
||||
echo "no"
|
||||
else
|
||||
if ${PKG_CONFIG} libbsd --exists; then
|
||||
- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
+ echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
echo "no"
|
||||
else
|
||||
echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
|
||||
@@ -472,8 +472,8 @@ check_cap()
|
||||
echo "HAVE_CAP:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -633,7 +633,3 @@ check_strlcpy
|
||||
|
||||
echo -n "libcap support: "
|
||||
check_cap
|
||||
-
|
||||
-echo >> $CONFIG
|
||||
-echo "%.o: %.c" >> $CONFIG
|
||||
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
|
||||
--- a/dcb/Makefile
|
||||
+++ b/dcb/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DCBOBJ = dcb.o \
|
||||
dcb_app.o \
|
||||
--- a/devlink/Makefile
|
||||
+++ b/devlink/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DEVLINKOBJ = devlink.o mnlg.o
|
||||
TARGETS += devlink
|
||||
--- a/genl/Makefile
|
||||
+++ b/genl/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
GENLOBJ=genl.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
--- a/ip/Makefile
|
||||
+++ b/ip/Makefile
|
||||
@@ -18,6 +18,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
|
||||
RTMONOBJ=rtmon.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=routel
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -fPIC
|
||||
|
||||
--- a/misc/Makefile
|
||||
+++ b/misc/Makefile
|
||||
@@ -5,6 +5,7 @@ LNSTATOBJ=lnstat.o lnstat_util.o
|
||||
TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
TARGETS += arpd
|
||||
--- a/netem/Makefile
|
||||
+++ b/netem/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DISTGEN = maketable normal pareto paretonormal
|
||||
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
|
||||
--- a/rdma/Makefile
|
||||
+++ b/rdma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -I./include/uapi/
|
||||
|
||||
--- a/tc/Makefile
|
||||
+++ b/tc/Makefile
|
||||
@@ -4,6 +4,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \
|
||||
emp_ematch.tab.o emp_ematch.lex.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
--- a/tipc/Makefile
|
||||
+++ b/tipc/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TIPCOBJ=bearer.o \
|
||||
cmdl.o link.o \
|
||||
--- a/vdpa/Makefile
|
||||
+++ b/vdpa/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -I./include/uapi/
|
||||
VDPAOBJ = vdpa.o
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
http://bugs.gentoo.org/291907
|
||||
|
||||
This patch was merged from two patches extracted from this thread:
|
||||
http://markmail.org/thread/qkd76gpdgefpjlfn
|
||||
|
||||
tc_stab.c: small fixes to commandline help
|
||||
|
||||
|
||||
tc_core.c:
|
||||
As kernel part of things relies on cell align which is always set to -1,
|
||||
I also added it to userspace computation stage. This way if someone
|
||||
specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
|
||||
end with tsize supporting mtu 4096 suddenly, New default mtu is also set
|
||||
to 2048 (disregarding weirdness of setting mtu to such values).
|
||||
|
||||
|
||||
Unless I missed something, this is harmless and feels cleaner, but if it's
|
||||
not allowed, documentation will have to be changed back to 2047 + extra
|
||||
explanation as well.
|
||||
--- a/tc/tc_core.c
|
||||
+++ b/tc/tc_core.c
|
||||
@@ -197,12 +197,12 @@ int tc_calc_size_table(struct tc_sizespec *s, __u16 **stab)
|
||||
}
|
||||
|
||||
if (s->mtu == 0)
|
||||
- s->mtu = 2047;
|
||||
+ s->mtu = 2048;
|
||||
if (s->tsize == 0)
|
||||
s->tsize = 512;
|
||||
|
||||
s->cell_log = 0;
|
||||
- while ((s->mtu >> s->cell_log) > s->tsize - 1)
|
||||
+ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
|
||||
s->cell_log++;
|
||||
|
||||
*stab = malloc(s->tsize * sizeof(__u16));
|
||||
--- a/tc/tc_stab.c
|
||||
+++ b/tc/tc_stab.c
|
||||
@@ -27,7 +27,7 @@ static void stab_help(void)
|
||||
fprintf(stderr,
|
||||
"Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ]\n"
|
||||
" [ overhead BYTES ] [ linklayer TYPE ] ...\n"
|
||||
- " mtu : max packet size we create rate map for {2047}\n"
|
||||
+ " mtu : max packet size we create size table for {2048}\n"
|
||||
" tsize : how many slots should size table have {512}\n"
|
||||
" mpu : minimum packet size used in rate computations\n"
|
||||
" overhead : per-packet size overhead used in rate computations\n"
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
https://lore.kernel.org/netdev/20231202024705.1375296-1-sam@gentoo.org/T/#u
|
||||
|
||||
From 3dc0bf34c1571429c08a8d0c08a69502e3e4575c Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 2 Dec 2023 02:46:05 +0000
|
||||
Subject: [PATCH] configure: Add _GNU_SOURCE to strlcpy configure test
|
||||
|
||||
>=glibc-2.38 adds strlcpy but it's guarded under a feature-test macro. Just
|
||||
add _GNU_SOURCE to the configure test because we already pass _GNU_SOURCE unconditionally
|
||||
in the Makefiles when building iproute2.
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -445,6 +445,7 @@ EOF
|
||||
check_strlcpy()
|
||||
{
|
||||
cat >$TMPDIR/strtest.c <<EOF
|
||||
+#define _GNU_SOURCE
|
||||
#include <string.h>
|
||||
int main(int argc, char **argv) {
|
||||
char dst[10];
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
https://bugs.gentoo.org/920054
|
||||
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=962692356a1cc41932e43575f3c50927e455ab53
|
||||
|
||||
From 962692356a1cc41932e43575f3c50927e455ab53 Mon Sep 17 00:00:00 2001
|
||||
From: Andrea Claudi <aclaudi@redhat.com>
|
||||
Date: Wed, 15 Nov 2023 18:25:35 +0100
|
||||
Subject: Makefile: use /usr/share/iproute2 for config files
|
||||
|
||||
According to FHS:
|
||||
|
||||
"/usr/lib includes object files and libraries. On some systems, it may
|
||||
also include internal binaries that are not intended to be executed
|
||||
directly by users or shell scripts."
|
||||
|
||||
A better directory to store config files is /usr/share:
|
||||
|
||||
"The /usr/share hierarchy is for all read-only architecture independent
|
||||
data files.
|
||||
|
||||
This hierarchy is intended to be shareable among all architecture
|
||||
platforms of a given OS; thus, for example, a site with i386, Alpha, and
|
||||
PPC platforms might maintain a single /usr/share directory that is
|
||||
centrally-mounted."
|
||||
|
||||
Accordingly, move configuration files to $(DATADIR)/iproute2.
|
||||
|
||||
Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config")
|
||||
Reported-by: Luca Boccassi <luca.boccassi@gmail.com>
|
||||
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
||||
Acked-by: Luca Boccassi <bluca@debian.org>
|
||||
Reviewed-by: Simon Horman <horms@kernel.org>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a24844cf0..8024d45ec 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,12 +16,12 @@ endif
|
||||
|
||||
PREFIX?=/usr
|
||||
SBINDIR?=/sbin
|
||||
-CONF_ETC_DIR?=/etc/iproute2
|
||||
-CONF_USR_DIR?=$(PREFIX)/lib/iproute2
|
||||
NETNS_RUN_DIR?=/var/run/netns
|
||||
NETNS_ETC_DIR?=/etc/netns
|
||||
DATADIR?=$(PREFIX)/share
|
||||
HDRDIR?=$(PREFIX)/include/iproute2
|
||||
+CONF_ETC_DIR?=/etc/iproute2
|
||||
+CONF_USR_DIR?=$(DATADIR)/iproute2
|
||||
DOCDIR?=$(DATADIR)/doc/iproute2
|
||||
MANDIR?=$(DATADIR)/man
|
||||
ARPDDIR?=/var/lib/arpd
|
||||
--
|
||||
cgit 1.2.3-korg
|
||||
@ -1,38 +0,0 @@
|
||||
https://bugs.gentoo.org/920054
|
||||
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=deb66acabe44d103c8368b62a76ef37aa074748d
|
||||
|
||||
From deb66acabe44d103c8368b62a76ef37aa074748d Mon Sep 17 00:00:00 2001
|
||||
From: Luca Boccassi <bluca@debian.org>
|
||||
Date: Mon, 6 Nov 2023 00:14:10 +0000
|
||||
Subject: Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
|
||||
|
||||
LIBDIR in Debian and derivatives is not /usr/lib/, it's
|
||||
/usr/lib/<architecture triplet>/, which is different, and it's the
|
||||
wrong location where to install architecture-independent default
|
||||
configuration files, which should always go to /usr/lib/ instead.
|
||||
Installing these files to the per-architecture directory is not
|
||||
the right thing, hence revert the change.
|
||||
|
||||
This reverts commit 946753a4459bd035132a27bb2eb87529c1979b90.
|
||||
|
||||
Signed-off-by: Luca Boccassi <bluca@debian.org>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5c559c8dc..a24844cf0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -17,7 +17,7 @@ endif
|
||||
PREFIX?=/usr
|
||||
SBINDIR?=/sbin
|
||||
CONF_ETC_DIR?=/etc/iproute2
|
||||
-CONF_USR_DIR?=$(LIBDIR)/iproute2
|
||||
+CONF_USR_DIR?=$(PREFIX)/lib/iproute2
|
||||
NETNS_RUN_DIR?=/var/run/netns
|
||||
NETNS_ETC_DIR?=/etc/netns
|
||||
DATADIR?=$(PREFIX)/share
|
||||
--
|
||||
cgit 1.2.3-korg
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -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"
|
||||
@ -24,11 +24,10 @@ RESTRICT="test"
|
||||
|
||||
# We could make libmnl optional, but it's tiny, so eh
|
||||
RDEPEND="
|
||||
!net-misc/arpd
|
||||
!minimal? ( net-libs/libmnl:= )
|
||||
atm? ( net-dialup/linux-atm )
|
||||
berkdb? ( sys-libs/db:= )
|
||||
bpf? ( dev-libs/libbpf:= )
|
||||
bpf? ( >=dev-libs/libbpf-0.6:= )
|
||||
caps? ( sys-libs/libcap )
|
||||
elf? ( virtual/libelf:= )
|
||||
iptables? ( >=net-firewall/iptables-1.4.20:= )
|
||||
@ -50,6 +49,7 @@ BDEPEND="
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.10.0-musl-1.patch # bug #936234
|
||||
"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
|
||||
"${FILESDIR}"/${PN}-6.12.0-musl-3.patch # bug #946088
|
||||
"${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
|
||||
@ -112,7 +112,8 @@ src_configure() {
|
||||
|
||||
# run "configure" script first which will create "config.mk"...
|
||||
# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
|
||||
edo ./configure --color=auto --libbpf_force $(usex bpf on off)
|
||||
eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
|
||||
edo ./configure --libbpf_force $(usex bpf on off) "${EXTRA_ECONF[@]}"
|
||||
|
||||
# Remove the definitions made by configure and allow them to be overridden
|
||||
# by USE flags below.
|
||||
@ -1,212 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo toolchain-funcs
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
|
||||
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"
|
||||
fi
|
||||
|
||||
DESCRIPTION="kernel routing and traffic control utilities"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
|
||||
# Needs root
|
||||
RESTRICT="test"
|
||||
|
||||
# We could make libmnl optional, but it's tiny, so eh
|
||||
RDEPEND="
|
||||
!net-misc/arpd
|
||||
!minimal? ( net-libs/libmnl:= )
|
||||
atm? ( net-dialup/linux-atm )
|
||||
berkdb? ( sys-libs/db:= )
|
||||
bpf? ( dev-libs/libbpf:= )
|
||||
caps? ( sys-libs/libcap )
|
||||
elf? ( virtual/libelf:= )
|
||||
iptables? ( >=net-firewall/iptables-1.4.20:= )
|
||||
nfs? ( net-libs/libtirpc:= )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
"
|
||||
# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.16
|
||||
"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-devel/bison-2.4
|
||||
app-alternatives/lex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
|
||||
"${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
|
||||
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
|
||||
"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
|
||||
"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
|
||||
"${FILESDIR}"/${PN}-6.6.0-revert-CONF_USR_DIR.patch
|
||||
"${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch
|
||||
"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix version if necessary
|
||||
local versionfile="include/version.h"
|
||||
if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
|
||||
einfo "Fixing version string"
|
||||
sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
|
||||
${versionfile} || die
|
||||
fi
|
||||
|
||||
# echo -n is not POSIX compliant
|
||||
sed -i 's@echo -n@printf@' configure || die
|
||||
|
||||
sed -i \
|
||||
-e '/^CC :\?=/d' \
|
||||
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
|
||||
-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
|
||||
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
|
||||
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
|
||||
Makefile || die
|
||||
|
||||
# Build against system headers
|
||||
rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
|
||||
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR CC PKG_CONFIG
|
||||
|
||||
# This sure is ugly. Should probably move into toolchain-funcs at some point.
|
||||
local setns
|
||||
pushd "${T}" >/dev/null || die
|
||||
printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
|
||||
if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
|
||||
setns=y
|
||||
else
|
||||
setns=n
|
||||
fi
|
||||
|
||||
echo 'int main(){return 0;}' > test.c || die
|
||||
if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
|
||||
sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
|
||||
fi
|
||||
popd >/dev/null || die
|
||||
|
||||
# run "configure" script first which will create "config.mk"...
|
||||
# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
|
||||
edo ./configure --libbpf_force $(usex bpf on off)
|
||||
|
||||
# Remove the definitions made by configure and allow them to be overridden
|
||||
# by USE flags below.
|
||||
# We have to do the cheesy only-sed-if-disabled because otherwise
|
||||
# the *_FLAGS etc stuff found by configure will be used but result
|
||||
# in a broken build.
|
||||
if ! use berkdb ; then
|
||||
sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use caps ; then
|
||||
sed -i -e '/HAVE_CAP/d' config.mk || die
|
||||
fi
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/HAVE_MNL/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use elf ; then
|
||||
sed -i -e '/HAVE_ELF/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use nfs ; then
|
||||
sed -i -e '/HAVE_RPC/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use selinux ; then
|
||||
sed -i -e '/HAVE_SELINUX/d' config.mk || die
|
||||
fi
|
||||
|
||||
# ...Now switch on/off requested features via USE flags
|
||||
# this is only useful if the test did not set other things, per bug #643722
|
||||
# Keep in sync with ifs above, or refactor to be unified.
|
||||
cat <<-EOF >> config.mk
|
||||
TC_CONFIG_ATM := $(usex atm y n)
|
||||
TC_CONFIG_XT := $(usex iptables y n)
|
||||
TC_CONFIG_NO_XT := $(usex iptables n y)
|
||||
# We've locked in recent enough kernel headers, bug #549948
|
||||
TC_CONFIG_IPSET := y
|
||||
HAVE_BERKELEY_DB := $(usex berkdb y n)
|
||||
HAVE_CAP := $(usex caps y n)
|
||||
HAVE_MNL := $(usex minimal n y)
|
||||
HAVE_ELF := $(usex elf y n)
|
||||
HAVE_RPC := $(usex nfs y n)
|
||||
HAVE_SELINUX := $(usex selinux y n)
|
||||
IP_CONFIG_SETNS := ${setns}
|
||||
# Use correct iptables dir, bug #144265, bug #293709
|
||||
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 NETNS_RUN_DIR=/run/netns
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal ; then
|
||||
into /
|
||||
dosbin tc/tc
|
||||
dobin ip/ip
|
||||
return 0
|
||||
fi
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="${EPREFIX}"/$(get_libdir) \
|
||||
SBINDIR="${EPREFIX}"/sbin \
|
||||
CONFDIR="${EPREFIX}"/etc/iproute2 \
|
||||
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
ARPDDIR="${EPREFIX}"/var/lib/arpd \
|
||||
install
|
||||
|
||||
dodir /bin
|
||||
mv "${ED}"/{s,}bin/ip || die # bug #330115
|
||||
mv "${ED}"/{s,}bin/ss || die # bug #547264
|
||||
|
||||
dolib.a lib/libnetlink.a
|
||||
insinto /usr/include
|
||||
doins include/libnetlink.h
|
||||
|
||||
# Collides with net-analyzer/ifstat
|
||||
# https://bugs.gentoo.org/868321
|
||||
mv "${ED}"/sbin/ifstat{,-iproute2} || die
|
||||
|
||||
if use berkdb ; then
|
||||
keepdir /var/lib/arpd
|
||||
# bug #47482, arpd doesn't need to be in /sbin
|
||||
dodir /usr/bin
|
||||
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
|
||||
elif [[ -d "${ED}"/var/lib/arpd ]]; then
|
||||
rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
|
||||
fi
|
||||
}
|
||||
@ -1,214 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo toolchain-funcs flag-o-matic
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
|
||||
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"
|
||||
fi
|
||||
|
||||
DESCRIPTION="kernel routing and traffic control utilities"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
|
||||
# Needs root
|
||||
RESTRICT="test"
|
||||
|
||||
# We could make libmnl optional, but it's tiny, so eh
|
||||
RDEPEND="
|
||||
!net-misc/arpd
|
||||
!minimal? ( net-libs/libmnl:= )
|
||||
atm? ( net-dialup/linux-atm )
|
||||
berkdb? ( sys-libs/db:= )
|
||||
bpf? ( dev-libs/libbpf:= )
|
||||
caps? ( sys-libs/libcap )
|
||||
elf? ( virtual/libelf:= )
|
||||
iptables? ( >=net-firewall/iptables-1.4.20:= )
|
||||
nfs? ( net-libs/libtirpc:= )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
"
|
||||
# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.16
|
||||
"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-devel/bison-2.4
|
||||
app-alternatives/lex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
|
||||
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
|
||||
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
|
||||
"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
|
||||
"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix version if necessary
|
||||
local versionfile="include/version.h"
|
||||
if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
|
||||
einfo "Fixing version string"
|
||||
sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
|
||||
${versionfile} || die
|
||||
fi
|
||||
|
||||
# echo -n is not POSIX compliant
|
||||
sed -i 's@echo -n@printf@' configure || die
|
||||
|
||||
sed -i \
|
||||
-e '/^CC :\?=/d' \
|
||||
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
|
||||
-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
|
||||
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
|
||||
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
|
||||
Makefile || die
|
||||
|
||||
# Build against system headers
|
||||
rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
|
||||
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR CC PKG_CONFIG
|
||||
|
||||
# This sure is ugly. Should probably move into toolchain-funcs at some point.
|
||||
local setns
|
||||
pushd "${T}" >/dev/null || die
|
||||
printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
|
||||
if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
|
||||
setns=y
|
||||
else
|
||||
setns=n
|
||||
fi
|
||||
|
||||
echo 'int main(){return 0;}' > test.c || die
|
||||
if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
|
||||
sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
|
||||
fi
|
||||
popd >/dev/null || die
|
||||
|
||||
# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
|
||||
# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
|
||||
# https://bugs.gentoo.org/929233
|
||||
append-ldflags ${CFLAGS}
|
||||
|
||||
# run "configure" script first which will create "config.mk"...
|
||||
# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
|
||||
edo ./configure --color=auto --libbpf_force $(usex bpf on off)
|
||||
|
||||
# Remove the definitions made by configure and allow them to be overridden
|
||||
# by USE flags below.
|
||||
# We have to do the cheesy only-sed-if-disabled because otherwise
|
||||
# the *_FLAGS etc stuff found by configure will be used but result
|
||||
# in a broken build.
|
||||
if ! use berkdb ; then
|
||||
sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use caps ; then
|
||||
sed -i -e '/HAVE_CAP/d' config.mk || die
|
||||
fi
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/HAVE_MNL/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use elf ; then
|
||||
sed -i -e '/HAVE_ELF/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use nfs ; then
|
||||
sed -i -e '/HAVE_RPC/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use selinux ; then
|
||||
sed -i -e '/HAVE_SELINUX/d' config.mk || die
|
||||
fi
|
||||
|
||||
# ...Now switch on/off requested features via USE flags
|
||||
# this is only useful if the test did not set other things, per bug #643722
|
||||
# Keep in sync with ifs above, or refactor to be unified.
|
||||
cat <<-EOF >> config.mk
|
||||
TC_CONFIG_ATM := $(usex atm y n)
|
||||
TC_CONFIG_XT := $(usex iptables y n)
|
||||
TC_CONFIG_NO_XT := $(usex iptables n y)
|
||||
# We've locked in recent enough kernel headers, bug #549948
|
||||
TC_CONFIG_IPSET := y
|
||||
HAVE_BERKELEY_DB := $(usex berkdb y n)
|
||||
HAVE_CAP := $(usex caps y n)
|
||||
HAVE_MNL := $(usex minimal n y)
|
||||
HAVE_ELF := $(usex elf y n)
|
||||
HAVE_RPC := $(usex nfs y n)
|
||||
HAVE_SELINUX := $(usex selinux y n)
|
||||
IP_CONFIG_SETNS := ${setns}
|
||||
# Use correct iptables dir, bug #144265, bug #293709
|
||||
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 NETNS_RUN_DIR=/run/netns
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal ; then
|
||||
into /
|
||||
dosbin tc/tc
|
||||
dobin ip/ip
|
||||
return 0
|
||||
fi
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="${EPREFIX}"/$(get_libdir) \
|
||||
SBINDIR="${EPREFIX}"/sbin \
|
||||
CONFDIR="${EPREFIX}"/etc/iproute2 \
|
||||
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
ARPDDIR="${EPREFIX}"/var/lib/arpd \
|
||||
install
|
||||
|
||||
dodir /bin
|
||||
mv "${ED}"/{s,}bin/ip || die # bug #330115
|
||||
mv "${ED}"/{s,}bin/ss || die # bug #547264
|
||||
|
||||
dolib.a lib/libnetlink.a
|
||||
insinto /usr/include
|
||||
doins include/libnetlink.h
|
||||
|
||||
# Collides with net-analyzer/ifstat
|
||||
# https://bugs.gentoo.org/868321
|
||||
mv "${ED}"/sbin/ifstat{,-iproute2} || die
|
||||
|
||||
if use berkdb ; then
|
||||
keepdir /var/lib/arpd
|
||||
# bug #47482, arpd doesn't need to be in /sbin
|
||||
dodir /usr/bin
|
||||
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
|
||||
elif [[ -d "${ED}"/var/lib/arpd ]]; then
|
||||
rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
|
||||
fi
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user