From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/xdp-tools/, net-libs/xdp-tools/files/
Date: Fri, 27 Oct 2023 02:59:17 +0000 (UTC) [thread overview]
Message-ID: <1698375195.954b98b84ca9d223f7ecbf807e08291e82d85aa9.sam@gentoo> (raw)
commit: 954b98b84ca9d223f7ecbf807e08291e82d85aa9
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sat Oct 21 08:57:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:53:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954b98b8
net-libs/xdp-tools: clean up obsolete versions
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/xdp-tools/Manifest | 2 -
.../files/1.3.1-disable-stack-protector.patch | 32 --------
.../files/1.3.1-fix-btf__type_cnt-detection.patch | 36 ---------
net-libs/xdp-tools/files/1.3.1-musl.patch | 28 -------
net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch | 36 ---------
net-libs/xdp-tools/xdp-tools-1.2.8.ebuild | 52 -------------
net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild | 88 ----------------------
7 files changed, 274 deletions(-)
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 7cbae12d5e78..766e3e9c5f3c 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,3 +1 @@
-DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626
-DIST xdp-tools-1.3.1.tar.gz 330516 BLAKE2B 89a61f47ba26efe6d0630d971e913e034d111d05c896e5af1bb28e6cb4e94133e6ecd827a10ee12a935ae2e6856f04556ac564ded1bcc65182766d656f8d0c5f SHA512 9dd434095a043158d14fb6829fa632fc4a0714dc0b6e08c219dfb55cb9f34005300db750115e08bd54210e90142bd499904616da077b8aa827e4de28c31be637
DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a
diff --git a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch b/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch
deleted file mode 100644
index 3a37b26efa14..000000000000
--- a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-From: https://github.com/xdp-project/xdp-tools/commit/cb6d06219d1b49b07980b481a383e1dea74a0702
-Bug: https://bugs.gentoo.org/889842
-
-From cb6d06219d1b49b07980b481a383e1dea74a0702 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 4 Mar 2023 20:08:25 +0100
-Subject: [PATCH] make: disable stack protector for BPF bits built by clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The clang toolchain might have stack-protection enabled by default
-(e.g. via platform configuration) and that won't work for BPF,
-so unconfitionally disable it via -fno-stack-protector.
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- lib/defines.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/defines.mk b/lib/defines.mk
-index f134c43b..54b259f2 100644
---- a/lib/defines.mk
-+++ b/lib/defines.mk
-@@ -1,5 +1,5 @@
- CFLAGS ?= -O2 -g
--BPF_CFLAGS ?= -Wno-visibility
-+BPF_CFLAGS ?= -Wno-visibility -fno-stack-protector
- BPF_TARGET ?= bpf
-
- HAVE_FEATURES :=
diff --git a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch b/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch
deleted file mode 100644
index d805e1077c76..000000000000
--- a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-From https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3
-
-From a7df567634af77381832a2212c5f5099b07734f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
-Date: Sat, 4 Mar 2023 20:07:39 +0100
-Subject: [PATCH] configure: Fix function detection for btf__type_cnt()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The configure check for btf__type_cnt() swapped two arguments in the
-check_libbpf_function() call in the configure script, leading to the check
-failing if LIBBPF_CFLAGS is non-empty. Make sure the arguments are in the
-right order, and also pass a proper NULL parameter in the check instead of
-a 0.
-
-Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 016c5bbd..62c2f883 100755
---- a/configure
-+++ b/configure
-@@ -272,7 +272,7 @@ check_libbpf_functions()
-
- check_libbpf_function "perf_buffer__consume" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
- check_libbpf_function "btf__load_from_kernel_by_id" "(0)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
-- check_libbpf_function "btf__type_cnt" "(0)" "$LIBBPF_CFLAGS" "" "$LIBBPF_LDLIBS"
-+ check_libbpf_function "btf__type_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
- check_libbpf_function "bpf_object__next_map" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
- check_libbpf_function "bpf_object__next_program" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
- check_libbpf_function "bpf_program__insn_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
diff --git a/net-libs/xdp-tools/files/1.3.1-musl.patch b/net-libs/xdp-tools/files/1.3.1-musl.patch
deleted file mode 100644
index e3238871b262..000000000000
--- a/net-libs/xdp-tools/files/1.3.1-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/836708
-https://github.com/xdp-project/xdp-tools/pull/309
-
-From c9956abbfbd238bd2eb98c67ea002bfce29063a4 Mon Sep 17 00:00:00 2001
-From: Stijn Tintel <stijn@linux-ipv6.be>
-Date: Wed, 29 Mar 2023 04:25:06 +0300
-Subject: [PATCH] libxdp: fix build on musl
-
-In musl, PATH_MAX is defined in limits.h. Include it in libxdp.c to fix
-building systems using musl libc.
-
-libxdp.c: In function 'find_bpffs':
-libxdp.c:406:33: error: 'PATH_MAX' undeclared (first use in this function)
- 406 | static char bpf_wrk_dir[PATH_MAX];
- | ^~~~~~~~
-
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---- a/lib/libxdp/libxdp.c
-+++ b/lib/libxdp/libxdp.c
-@@ -22,6 +22,7 @@
- #include <fcntl.h>
- #include <inttypes.h>
- #include <dirent.h>
-+#include <limits.h>
-
- #include <linux/err.h> /* ERR_PTR */
- #include <linux/if_link.h>
-
diff --git a/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch b/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch
deleted file mode 100644
index 3983c8c8f402..000000000000
--- a/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-From: https://github.com/xdp-project/xdp-tools/commit/344b241da22a5358c714d6db1ea6f225f951dbdb
-
-From 344b241da22a5358c714d6db1ea6f225f951dbdb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Wed, 8 Mar 2023 18:50:56 +0100
-Subject: [PATCH] xdpdump: fix build with clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building all of xdp-tools with clang, the xdp-dump build fails
-due to 'classic' use of variable-length arrays and -Werror.
-Disable the warning and leave a breadcrumb to the discussion.
-
-Fixes: #304
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- xdp-dump/Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/xdp-dump/Makefile b/xdp-dump/Makefile
-index 7ee1688e..a9ae0ae7 100644
---- a/xdp-dump/Makefile
-+++ b/xdp-dump/Makefile
-@@ -4,6 +4,10 @@ XDP_TARGETS := xdpdump_bpf xdpdump_xdp
- USER_TARGETS := xdpdump
- TEST_FILE := tests/test-xdpdump.sh
-
-+# Disable warnings about VLAs not being at the end of a structure when building
-+# with clang. The code is fine, but clang's complaint coupled with -Werror would
-+# break the build. See https://github.com/xdp-project/xdp-tools/issues/304
-+CFLAGS += "-Wno-gnu-variable-sized-type-not-at-end"
- LIB_DIR = ../lib
- USER_LIBS = -lpcap
- MAN_PAGE := xdpdump.8
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
deleted file mode 100644
index e881553d3eed..000000000000
--- a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The libxdp library and various tools for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="+tools"
-
-DEPEND="dev-libs/libbpf:=
- sys-libs/zlib
- net-libs/libpcap
- virtual/libelf"
-RDEPEND="${DEPEND}"
-BDEPEND=">=sys-devel/clang-10.0.0"
-
-# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
-QA_PREBUILT="usr/lib/bpf/*.o"
-
-MAKEOPTS+=" V=1"
-
-src_configure() {
- export PRODUCTION=1
- export DYNAMIC_LIBXDP=1
- export FORCE_SYSTEM_LIBBPF=1
- default
-}
-
-src_install() {
- export PREFIX="${EPREFIX}/usr"
- export LIBDIR="${PREFIX}/$(get_libdir)"
- export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
- default
-
- # To remove the scripts/testing files that are installed.
- rm -r "${ED}/usr/share/xdp-tools" || die
- # We can't control static archive generation yet.
- rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
-
- use tools || { rm "${ED}/usr/sbin"/* || die; }
-
- # These are ELF objects but BPF ones.
- dostrip -x /usr/lib/bpf
-}
-
-src_test() { :; }
diff --git a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild b/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild
deleted file mode 100644
index 543536b75ae6..000000000000
--- a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="The libxdp library and various tools for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+tools"
-
-DEPEND="
- dev-libs/libbpf:=
- dev-util/bpftool
- net-libs/libpcap
- sys-libs/zlib
- virtual/libelf
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/grep[pcre]
- >=sys-devel/clang-11.0.0
-"
-
-# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
-QA_PREBUILT="usr/lib/bpf/*.o"
-
-MAKEOPTS+=" V=1"
-
-PATCHES=(
- "${FILESDIR}"/1.3.1-disable-stack-protector.patch
- "${FILESDIR}"/1.3.1-fix-btf__type_cnt-detection.patch
- "${FILESDIR}"/1.3.1-no-Werror.patch
- "${FILESDIR}"/1.3.1-xdpdump-clang.patch
- "${FILESDIR}"/1.3.1-musl.patch
-)
-
-src_configure() {
- export PREFIX="${EPREFIX}/usr"
- export LIBDIR="${PREFIX}/$(get_libdir)"
- export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
- export PRODUCTION=1
- export DYNAMIC_LIBXDP=1
- export FORCE_SYSTEM_LIBBPF=1
-
- # bug 861587
- filter-lto
-
- default
-}
-
-src_test() { :; }
-
-src_install() {
- default
-
- # To remove the scripts/testing files that are installed.
- rm -r "${ED}/usr/share/xdp-tools" || die
- # We can't control static archive generation yet.
- rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
-
- use tools || { rm "${ED}/usr/sbin"/* || die; }
-
- # These are ELF objects but BPF ones.
- dostrip -x /usr/lib/bpf
-}
-
-pkg_postinst() {
- elog
- elog "Many BPF utilities need access to a mounted bpffs virtual file system."
- elog "Either mount it manually like this:"
- elog
- elog " mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700"
- elog
- elog "or add the following line to your /etc/fstab to always mount it at boot time:"
- elog
- elog " bpffs /sys/fs/bpf bpf nosuid,nodev,noexec,relatime,mode=700 0 0"
- elog
- elog "You can verify that bpffs is mounted with:"
- elog
- elog " mount | grep /sys/fs/bpf"
- elog
-}
next reply other threads:[~2023-10-27 2:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 2:59 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-09 14:39 [gentoo-commits] repo/gentoo:master commit in: net-libs/xdp-tools/, net-libs/xdp-tools/files/ Arthur Zamarin
2024-03-21 2:41 Sam James
2023-11-22 12:02 Sam James
2023-10-27 2:59 Sam James
2023-10-27 2:59 Sam James
2023-07-10 5:30 Sam James
2023-03-10 12:06 Sam James
2022-09-20 22:53 Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1698375195.954b98b84ca9d223f7ecbf807e08291e82d85aa9.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox