[gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/
@ 2020-04-10 14:47 Kurt Kanzenbach
  0 siblings, 0 replies; 5+ messages in thread
From: Kurt Kanzenbach @ 2020-04-10 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ba3039025987d0b8447f8b003a23d524dbe37a94
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Apr 10 14:45:02 2020 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Fri Apr 10 14:46:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba303902

dev-util/xdp-tools: Bump version to 0.0.3

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-util/xdp-tools/Manifest                        |  1 +
 .../xdp-tools/files/xdp-tools-0.0.3-install.patch  | 33 ++++++++++++
 dev-util/xdp-tools/xdp-tools-0.0.3.ebuild          | 59 ++++++++++++++++++++++
 3 files changed, 93 insertions(+)

diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
index b3dd09c..a3a4b83 100644
--- a/dev-util/xdp-tools/Manifest
+++ b/dev-util/xdp-tools/Manifest
@@ -1 +1,2 @@
 DIST xdp-tools-0.0.2.tar.gz 288960 BLAKE2B 0ff03200b288819b5180f55129494534f5ca09be5bb9bd167a022501dd63104251047d514a42dca905cb6879c55a20ec40b6f8d6828ac7559066fc3867f6ade9 SHA512 00455d77e2354b48f342d795d2141ae38b39137981e4a232971b6755e9b1c397db65c498817bbdf76946cc0d825c01e9b866ed504395f76be02f65625adc1bb9
+DIST xdp-tools-0.0.3.tar.gz 381386 BLAKE2B 1160d9a7cc2b6cf7b49e7223acdbeba72046c00ec710c21140da0607cac1e8a1231992a8967b2f8f2a964da593dfe0af08b28abbc3b13818ddafebbc2c3961a7 SHA512 c2a4278db41af020cf42b1139c93786a49ad2a071b2002177ac39e8d6b74203d251bd7823399d9e156c969d2ae741b0ecd4178edf446fe5c7270e53295458fce

diff --git a/dev-util/xdp-tools/files/xdp-tools-0.0.3-install.patch b/dev-util/xdp-tools/files/xdp-tools-0.0.3-install.patch
new file mode 100644
index 0000000..65349b5
--- /dev/null
+++ b/dev-util/xdp-tools/files/xdp-tools-0.0.3-install.patch
@@ -0,0 +1,33 @@
+From 744f5a2ab5fd2d570a0c6135262761ffdc23bb1f Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 10 Apr 2020 15:39:13 +0200
+Subject: [PATCH] lib: xdp: make: Fix library install
+
+Two problems:
+
+ * install doesn't handle symlinks
+ * static libs are installed
+
+Fix it.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ lib/libxdp/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
+index d5f465e3f67c..c4508889fab2 100644
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -42,7 +42,7 @@ install:
+ 	$(Q)install -d -m 0755 $(DESTDIR)$(HDRDIR)
+ 	$(Q)install -d -m 0755 $(DESTDIR)$(LIBDIR)
+ 	$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
+-	$(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
++	$(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
+ 
+ 
+ $(OBJDIR)/libxdp.a: $(STATIC_OBJS)
+-- 
+2.24.1
+

diff --git a/dev-util/xdp-tools/xdp-tools-0.0.3.ebuild b/dev-util/xdp-tools/xdp-tools-0.0.3.ebuild
new file mode 100644
index 0000000..1e10fb3
--- /dev/null
+++ b/dev-util/xdp-tools/xdp-tools-0.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info llvm multilib
+
+DESCRIPTION="Utilities and example programs for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+# skip strip for eBPF object files
+RESTRICT="strip"
+
+# skip QA check(s) for eBPF samples
+QA_EXECSTACK="usr/lib*/bpf/*.o"
+
+# XDP should be enabled
+CONFIG_CHECK="~XDP_SOCKETS"
+
+LLVM_MAX_SLOT=10
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libbpf-0.0.7
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+DEPEND="${RDEPEND}
+	sys-devel/clang:10
+	sys-devel/llvm:10
+"
+
+PATCHES=( "${FILESDIR}/${P}-install.patch" )
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	./configure
+}
+
+src_compile() {
+	emake PRODUCTION=1 PREFIX=/usr LIBDIR="/usr/$(get_libdir)" all
+}
+
+src_install() {
+	emake PRODUCTION=1 PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
+	doman xdp-filter/xdp-filter.8
+	doman xdp-dump/xdpdump.8
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/
@ 2021-01-15 17:15 Kurt Kanzenbach
  0 siblings, 0 replies; 5+ messages in thread
From: Kurt Kanzenbach @ 2021-01-15 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     666d20fb9ecd5e0fdb052fbfd3b0b895825d8482
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jan 15 17:13:43 2021 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Fri Jan 15 17:13:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=666d20fb

dev-util/xdp-tools: Bump to v1.1.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-util/xdp-tools/Manifest                        |  1 +
 .../xdp-tools/files/xdp-tools-1.1.0-install.patch  | 38 +++++++++++++
 dev-util/xdp-tools/xdp-tools-1.1.0.ebuild          | 66 ++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
index 87bfe52b..facab188 100644
--- a/dev-util/xdp-tools/Manifest
+++ b/dev-util/xdp-tools/Manifest
@@ -1 +1,2 @@
 DIST xdp-tools-1.0.1.tar.gz 150775 BLAKE2B 5b984aa20a125555d07b46c5f83f9f02f22f85130eb2d64c8808965fdc1c0903092a3de3c72c81360063b29269237cf94d74c712a88bbf0f30e239de0a499043 SHA512 918323b7ae85890c35403eab437491ad32df52f32c8abf3e698fefd09bfd445c6335730ca48fb830608a3baeb1f686c644ce992b90d5d3e1b2c8caf97832237d
+DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
new file mode 100644
index 00000000..702d555c
--- /dev/null
+++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
@@ -0,0 +1,38 @@
+From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 10 Apr 2020 15:39:13 +0200
+Subject: [PATCH] lib: xdp: make: Fix library install
+
+Two problems:
+
+ * install doesn't handle symlinks
+ * static libs are installed
+
+Fix it.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ lib/libxdp/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
+index f45cc93c3076..2efe6bbea67a 100644
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -49,12 +49,11 @@ install: all
+ 	$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
+ 	$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
+ 	$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	$(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
++	$(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
+ 	$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
+ 	$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
+ 	$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)
+ 
+-
+ $(OBJDIR)/libxdp.a: $(STATIC_OBJS)
+ 	$(QUIET_LINK)$(AR) rcs $@ $^
+ 
+-- 
+2.26.2
+

diff --git a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
new file mode 100644
index 00000000..0f16f708
--- /dev/null
+++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info llvm multilib
+
+DESCRIPTION="Utilities and example programs for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+# skip strip for eBPF object files
+RESTRICT="strip"
+
+# skip QA check(s) for eBPF samples
+QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
+QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
+
+# XDP should be enabled
+CONFIG_CHECK="~XDP_SOCKETS"
+
+LLVM_MAX_SLOT=10
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libbpf-0.0.7
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+DEPEND="${RDEPEND}
+	sys-devel/clang:10
+	sys-devel/llvm:10
+"
+
+PATCHES=( "${FILESDIR}/${P}-install.patch" )
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	./configure
+}
+
+src_compile() {
+	emake \
+		PRODUCTION=1 \
+		DYNAMIC_LIBXDP=1 \
+		FORCE_SYSTEM_LIBBPF=1 \
+		PREFIX=/usr \
+		LIBDIR="/usr/$(get_libdir)" all
+}
+
+src_install() {
+	emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
+	doman xdp-filter/xdp-filter.8
+	doman xdp-dump/xdpdump.8
+	doman xdp-loader/xdp-loader.8
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/
@ 2021-04-24 10:19 Kurt Kanzenbach
  0 siblings, 0 replies; 5+ messages in thread
From: Kurt Kanzenbach @ 2021-04-24 10:19 UTC (permalink / raw
  To: gentoo-commits

commit:     33d6cebd06e2d9c041cdc48b242102edb1d852e8
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Apr 24 10:18:01 2021 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Sat Apr 24 10:18:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33d6cebd

dev-util/xdp-tools: Don't call readelf directly

Allow to override it.

Closes: https://bugs.gentoo.org/785214
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 .../xdp-tools/files/xdp-tools-1.1.0-readelf.patch  | 52 ++++++++++++++++++++++
 dev-util/xdp-tools/xdp-tools-1.1.0.ebuild          |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
new file mode 100644
index 000000000..be68db3a8
--- /dev/null
+++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
@@ -0,0 +1,52 @@
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Subject: make: Fix hardcoded readelf
+
+Don't hardcode readelf. Allow to reuse something else.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+
+---
+ lib/libxdp/Makefile |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
+ 
+ CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
+ BPF_CFLAGS += -I$(HEADER_DIR)
+-
++READELF ?= readelf
+ 
+ ifndef BUILD_STATIC_ONLY
+ 	SHARED_LIBS := $(OBJDIR)/libxdp.so \
+@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
+ 
+ XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.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_abi
+@@ -105,12 +105,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/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
index 1f4477a5d..71dd1e00e 100644
--- a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
+++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
@@ -40,7 +40,10 @@ DEPEND="${RDEPEND}
 	sys-devel/llvm:10
 "
 
-PATCHES=( "${FILESDIR}/${P}-install.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+	"${FILESDIR}/${P}-readelf.patch"
+)
 
 pkg_setup() {
 	llvm_pkg_setup
@@ -54,6 +57,7 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		AR="$(tc-getAR)" \
+		READELF=$(tc-getREADELF) \
 		PRODUCTION=1 \
 		DYNAMIC_LIBXDP=1 \
 		FORCE_SYSTEM_LIBBPF=1 \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/
@ 2021-04-24 10:40 Kurt Kanzenbach
  0 siblings, 0 replies; 5+ messages in thread
From: Kurt Kanzenbach @ 2021-04-24 10:40 UTC (permalink / raw
  To: gentoo-commits

commit:     23e4b9edb0150f2bd81301de5f8b4a95a5a9f221
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Apr 24 10:38:51 2021 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Sat Apr 24 10:40:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23e4b9ed

dev-util/xdp-tools: Drop old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-util/xdp-tools/Manifest                        |  1 -
 .../xdp-tools/files/xdp-tools-1.1.0-install.patch  | 38 ------------
 .../xdp-tools/files/xdp-tools-1.1.0-readelf.patch  | 52 ----------------
 dev-util/xdp-tools/xdp-tools-1.1.0.ebuild          | 70 ----------------------
 4 files changed, 161 deletions(-)

diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
index 0362a71ee..c8dff02a4 100644
--- a/dev-util/xdp-tools/Manifest
+++ b/dev-util/xdp-tools/Manifest
@@ -1,2 +1 @@
-DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232
 DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
deleted file mode 100644
index 702d555c6..000000000
--- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 10 Apr 2020 15:39:13 +0200
-Subject: [PATCH] lib: xdp: make: Fix library install
-
-Two problems:
-
- * install doesn't handle symlinks
- * static libs are installed
-
-Fix it.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- lib/libxdp/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index f45cc93c3076..2efe6bbea67a 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -49,12 +49,11 @@ install: all
- 	$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
- 	$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
- 	$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
--	$(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
-+	$(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
- 	$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
- 	$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
- 	$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)
- 
--
- $(OBJDIR)/libxdp.a: $(STATIC_OBJS)
- 	$(QUIET_LINK)$(AR) rcs $@ $^
- 
--- 
-2.26.2
-

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
deleted file mode 100644
index be68db3a8..000000000
--- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Subject: make: Fix hardcoded readelf
-
-Don't hardcode readelf. Allow to reuse something else.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
-
----
- lib/libxdp/Makefile |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
- 
- CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
- BPF_CFLAGS += -I$(HEADER_DIR)
--
-+READELF ?= readelf
- 
- ifndef BUILD_STATIC_ONLY
- 	SHARED_LIBS := $(OBJDIR)/libxdp.so \
-@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
- 
- XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.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_abi
-@@ -105,12 +105,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/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
deleted file mode 100644
index 71dd1e00e..000000000
--- a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info llvm multilib toolchain-funcs
-
-DESCRIPTION="Utilities and example programs for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-# skip strip for eBPF object files
-# tests have to be run as root
-RESTRICT="strip test"
-
-# skip QA check(s) for eBPF samples
-QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
-QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
-
-# XDP should be enabled
-CONFIG_CHECK="~XDP_SOCKETS"
-
-LLVM_MAX_SLOT=10
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/libbpf-0.0.7
-	net-libs/libpcap
-	sys-libs/zlib
-	virtual/libelf
-"
-DEPEND="${RDEPEND}
-	sys-devel/clang:10
-	sys-devel/llvm:10
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-install.patch"
-	"${FILESDIR}/${P}-readelf.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	./configure || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		READELF=$(tc-getREADELF) \
-		PRODUCTION=1 \
-		DYNAMIC_LIBXDP=1 \
-		FORCE_SYSTEM_LIBBPF=1 \
-		PREFIX=/usr \
-		LIBDIR="/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/
@ 2021-07-13 19:32 Kurt Kanzenbach
  0 siblings, 0 replies; 5+ messages in thread
From: Kurt Kanzenbach @ 2021-07-13 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     546e1b2e1a11861bbd110fe589cd80b80180c826
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Tue Jul 13 19:29:43 2021 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Tue Jul 13 19:29:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=546e1b2e

dev-util/xdp-tools: Bump to v1.2.0

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-util/xdp-tools/Manifest                        |  1 +
 .../xdp-tools/files/xdp-tools-1.2.0-install.patch  | 23 +++++++
 .../xdp-tools/files/xdp-tools-1.2.0-readelf.patch  | 51 ++++++++++++++++
 dev-util/xdp-tools/xdp-tools-1.2.0.ebuild          | 70 ++++++++++++++++++++++
 4 files changed, 145 insertions(+)

diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
index c8dff02a4..7edd421bf 100644
--- a/dev-util/xdp-tools/Manifest
+++ b/dev-util/xdp-tools/Manifest
@@ -1 +1,2 @@
 DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5
+DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch
new file mode 100644
index 000000000..a02fb50f1
--- /dev/null
+++ b/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch
@@ -0,0 +1,23 @@
+From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 10 Apr 2020 15:39:13 +0200
+Subject: [PATCH] lib: xdp: make: Don't install static libs
+
+Don't install static libs.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ lib/libxdp/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -49,7 +49,7 @@ install: all
+ 	$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
+ 	$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
+ 	$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	$(Q)cp -fpR $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
++	$(Q)cp -fpR $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
+ 	$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
+ 	$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
+ 	$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch
new file mode 100644
index 000000000..9566c27b8
--- /dev/null
+++ b/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch
@@ -0,0 +1,51 @@
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Subject: lib: xdp: make: Fix hardcoded readelf
+
+Don't hardcode readelf. Allow to reuse something else.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ lib/libxdp/Makefile |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
+ 
+ CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
+ BPF_CFLAGS += -I$(HEADER_DIR)
+-
++READELF ?= readelf
+ 
+ ifndef BUILD_STATIC_ONLY
+ 	SHARED_LIBS := $(OBJDIR)/libxdp.so \
+@@ -89,12 +89,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
+ 
+ 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_abi
+@@ -106,12 +106,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/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild
new file mode 100644
index 000000000..9c66034a8
--- /dev/null
+++ b/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info llvm multilib toolchain-funcs
+
+DESCRIPTION="Utilities and example programs for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+# skip strip for eBPF object files
+# tests have to be run as root
+RESTRICT="strip test"
+
+# skip QA check(s) for eBPF samples
+QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
+QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
+
+# XDP should be enabled
+CONFIG_CHECK="~XDP_SOCKETS"
+
+LLVM_MAX_SLOT=12
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libbpf-0.0.7
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+DEPEND="${RDEPEND}
+	sys-devel/clang
+	sys-devel/llvm
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+	"${FILESDIR}/${P}-readelf.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	./configure || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		READELF=$(tc-getREADELF) \
+		PRODUCTION=1 \
+		DYNAMIC_LIBXDP=1 \
+		FORCE_SYSTEM_LIBBPF=1 \
+		PREFIX=/usr \
+		LIBDIR="/usr/$(get_libdir)" all
+}
+
+src_install() {
+	emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-07-13 19:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-15 17:15 [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/ Kurt Kanzenbach
  -- strict thread matches above, loose matches on Subject: below --
2021-07-13 19:32 Kurt Kanzenbach
2021-04-24 10:40 Kurt Kanzenbach
2021-04-24 10:19 Kurt Kanzenbach
2020-04-10 14:47 Kurt Kanzenbach

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox