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: Thu, 21 Mar 2024 02:41:22 +0000 (UTC) [thread overview]
Message-ID: <1710988770.dac30da69c00eadca3981403b1ef3b31b151d1ba.sam@gentoo> (raw)
commit: dac30da69c00eadca3981403b1ef3b31b151d1ba
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Jan 30 17:47:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 02:39:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac30da6
net-libs/xdp-tools: clean up old
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/35098
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/xdp-tools/files/1.4.0-no-Werror.patch | 75 ----------------------
net-libs/xdp-tools/files/1.4.0-toolchain.patch | 57 -----------------
net-libs/xdp-tools/xdp-tools-1.4.0.ebuild | 87 --------------------------
3 files changed, 219 deletions(-)
diff --git a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
deleted file mode 100644
index fb086f5122b9..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-Bug: https://bugs.gentoo.org/899744
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 5ee035d..5342ab3 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,5 @@
-
--LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
-+LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
-
- LIB_DIR = .
- include defines.mk
-diff --git a/lib/common.mk b/lib/common.mk
-index b680a75..8dbcb39 100644
---- a/lib/common.mk
-+++ b/lib/common.mk
-@@ -116,7 +116,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
- -Wno-unused-value \
- -Wno-pointer-sign \
- -Wno-compare-distinct-pointer-types \
-- -Werror \
- -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
-
-diff --git a/lib/defines.mk b/lib/defines.mk
-index 54b259f..ed246c0 100644
---- a/lib/defines.mk
-+++ b/lib/defines.mk
-@@ -40,7 +40,7 @@ endif
-
- DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-
--CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
-+CFLAGS += -std=gnu11 -Wextra $(DEFINES)
- BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS))
-
- CONFIGMK := $(LIB_DIR)/../config.mk
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 431932a..a0c625d 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -142,7 +142,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
- -Wno-unused-value \
- -Wno-pointer-sign \
- -Wno-compare-distinct-pointer-types \
-- -Werror \
- -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
-
-diff --git a/lib/libxdp/tests/Makefile b/lib/libxdp/tests/Makefile
-index 3c22901..a4463f3 100644
---- a/lib/libxdp/tests/Makefile
-+++ b/lib/libxdp/tests/Makefile
-@@ -72,7 +72,6 @@ $(BPF_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK) $(EXTRA_DEPS)
- -Wno-unused-value \
- -Wno-pointer-sign \
- -Wno-compare-distinct-pointer-types \
-- -Werror \
- -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
-
-diff --git a/lib/util/Makefile b/lib/util/Makefile
-index 24070f0..37485b3 100644
---- a/lib/util/Makefile
-+++ b/lib/util/Makefile
-@@ -26,7 +26,6 @@ $(UTIL_BPF_OBJS): %.o: %.c $(KERN_USER_H) $(BPF_HEADERS) $(LIBMK)
- -Wno-unused-value \
- -Wno-pointer-sign \
- -Wno-compare-distinct-pointer-types \
-- -Werror \
- -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
-
diff --git a/net-libs/xdp-tools/files/1.4.0-toolchain.patch b/net-libs/xdp-tools/files/1.4.0-toolchain.patch
deleted file mode 100644
index d4bcb511310f..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-toolchain.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Patch from: https://github.com/xdp-project/xdp-tools/pull/341
-
-From b1377b35cd05daf4d3afc3d59839e9889a642ffb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 8 Jul 2023 12:34:20 +0200
-Subject: [PATCH] libxdp: don't use direct call to readelf for symbol table
- comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gentoo CI previously reported symbol mismatches in libxdp
-(see #302 and https://bugs.gentoo.org/899742). This was
-caused by a direct call to 'readelf' instead of using the
-command injected by the environment/toolchain.
-The fix is simple: use $(READELF).
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- lib/libxdp/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 43de3e8a..532e0687 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -93,12 +93,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR)
-
- XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o
-
--GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
-+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
- sed 's/\[.*\]//' | \
- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
- sort -u | wc -l)
--VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
-+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
- grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
-
- check: $(CHECK_RULES)
-@@ -110,12 +110,12 @@ check_abi: $(OBJDIR)/libxdp.so
- "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
- "Please make sure all symbols are" \
- "versioned in $(VERSION_SCRIPT)." >&2; \
-- readelf -s --wide $(XDP_IN_SHARED) | \
-+ $(READELF) -s --wide $(XDP_IN_SHARED) | \
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
- sed 's/\[.*\]//' | \
- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \
- sort -u > $(OUTPUT)libxdp_global_syms.tmp; \
-- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \
-+ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \
- grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \
- sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \
- diff -u $(OUTPUT)libxdp_global_syms.tmp \
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
deleted file mode 100644
index fb70b301ec4d..000000000000
--- a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-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 ~riscv ~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.4.0-no-Werror.patch
- "${FILESDIR}"/1.4.0-toolchain.patch
-)
-
-src_configure() {
- export CC="$(tc-getCC)"
- export LD="$(tc-getLD)"
- 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:[~2024-03-21 2:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 2:41 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
2023-11-22 12:02 Sam James
2023-10-27 2:59 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=1710988770.dac30da69c00eadca3981403b1ef3b31b151d1ba.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