Gentoo Archives: gentoo-commits

From: Kurt Kanzenbach <kurt@×××××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xdp-tools/files/, dev-util/xdp-tools/
Date: Tue, 13 Jul 2021 19:32:44
Message-Id: 1626204654.ff25391c8f5618d62965ffdb6cf20a53e33cbec7.KurtKanzenbach@gentoo
1 commit: ff25391c8f5618d62965ffdb6cf20a53e33cbec7
2 Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
3 AuthorDate: Tue Jul 13 19:30:54 2021 +0000
4 Commit: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
5 CommitDate: Tue Jul 13 19:30:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff25391c
7
8 dev-util/xdp-tools: Drop old
9
10 Closes: https://bugs.gentoo.org/785370
11 Package-Manager: Portage-3.0.20, Repoman-3.0.2
12 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
13
14 dev-util/xdp-tools/Manifest | 1 -
15 .../xdp-tools/files/xdp-tools-1.1.1-install.patch | 23 -------
16 .../xdp-tools/files/xdp-tools-1.1.1-readelf.patch | 51 ---------------
17 dev-util/xdp-tools/xdp-tools-1.1.1.ebuild | 75 ----------------------
18 4 files changed, 150 deletions(-)
19
20 diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
21 index 7edd421bf..5ecf7cd4b 100644
22 --- a/dev-util/xdp-tools/Manifest
23 +++ b/dev-util/xdp-tools/Manifest
24 @@ -1,2 +1 @@
25 -DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5
26 DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9
27
28 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch
29 deleted file mode 100644
30 index a02fb50f1..000000000
31 --- a/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch
32 +++ /dev/null
33 @@ -1,23 +0,0 @@
34 -From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
35 -From: Kurt Kanzenbach <kurt@×××××××××××××.de>
36 -Date: Fri, 10 Apr 2020 15:39:13 +0200
37 -Subject: [PATCH] lib: xdp: make: Don't install static libs
38 -
39 -Don't install static libs.
40 -
41 -Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
42 ----
43 - lib/libxdp/Makefile | 2 +-
44 - 1 file changed, 1 insertion(+), 1 deletion(-)
45 -
46 ---- a/lib/libxdp/Makefile
47 -+++ b/lib/libxdp/Makefile
48 -@@ -49,7 +49,7 @@ install: all
49 - $(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
50 - $(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
51 - $(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
52 -- $(Q)cp -fpR $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
53 -+ $(Q)cp -fpR $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
54 - $(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
55 - $(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
56 - $(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)
57
58 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch
59 deleted file mode 100644
60 index 2330e549d..000000000
61 --- a/dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch
62 +++ /dev/null
63 @@ -1,51 +0,0 @@
64 -From: Kurt Kanzenbach <kurt@×××××××××××××.de>
65 -Subject: lib: xdp: make: Fix hardcoded readelf
66 -
67 -Don't hardcode readelf. Allow to reuse something else.
68 -
69 -Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
70 ----
71 - lib/libxdp/Makefile | 10 +++++-----
72 - 1 file changed, 5 insertions(+), 5 deletions(-)
73 -
74 ---- a/lib/libxdp/Makefile
75 -+++ b/lib/libxdp/Makefile
76 -@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
77 -
78 - CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
79 - BPF_CFLAGS += -I$(HEADER_DIR)
80 --
81 -+READELF ?= readelf
82 -
83 - ifndef BUILD_STATIC_ONLY
84 - SHARED_LIBS := $(OBJDIR)/libxdp.so \
85 -@@ -89,12 +89,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
86 -
87 - XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o
88 -
89 --GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
90 -+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
91 - cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
92 - sed 's/\[.*\]//' | \
93 - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
94 - sort -u | wc -l)
95 --VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
96 -+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
97 - grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
98 -
99 - check: check_abi
100 -@@ -106,12 +106,12 @@ check_abi: $(OBJDIR)/libxdp.so
101 - "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
102 - "Please make sure all symbols are" \
103 - "versioned in $(VERSION_SCRIPT)." >&2; \
104 -- readelf -s --wide $(XDP_IN_SHARED) | \
105 -+ $(READELF) -s --wide $(XDP_IN_SHARED) | \
106 - cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
107 - sed 's/\[.*\]//' | \
108 - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \
109 - sort -u > $(OUTPUT)libxdp_global_syms.tmp; \
110 -- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \
111 -+ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \
112 - grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \
113 - sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \
114 - diff -u $(OUTPUT)libxdp_global_syms.tmp \
115
116 diff --git a/dev-util/xdp-tools/xdp-tools-1.1.1.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.1.ebuild
117 deleted file mode 100644
118 index 694cfccfb..000000000
119 --- a/dev-util/xdp-tools/xdp-tools-1.1.1.ebuild
120 +++ /dev/null
121 @@ -1,75 +0,0 @@
122 -# Copyright 1999-2021 Gentoo Authors
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI=7
126 -
127 -inherit linux-info llvm multilib toolchain-funcs
128 -
129 -# version v1.1.1 is not tagged, use commit
130 -MY_COMMIT="69827a07b395b78a2b577c3e1af6075f8c47fdd8"
131 -
132 -DESCRIPTION="Utilities and example programs for use with XDP"
133 -HOMEPAGE="https://github.com/xdp-project/xdp-tools"
134 -SRC_URI="https://github.com/xdp-project/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
135 -
136 -SLOT="0"
137 -LICENSE="GPL-2"
138 -KEYWORDS="~amd64 ~x86"
139 -
140 -# skip strip for eBPF object files
141 -# tests have to be run as root
142 -RESTRICT="strip test"
143 -
144 -# skip QA check(s) for eBPF samples
145 -QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
146 -QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
147 -
148 -# XDP should be enabled
149 -CONFIG_CHECK="~XDP_SOCKETS"
150 -
151 -LLVM_MAX_SLOT=10
152 -
153 -BDEPEND="
154 - virtual/pkgconfig
155 -"
156 -RDEPEND="
157 - >=dev-libs/libbpf-0.0.7
158 - net-libs/libpcap
159 - sys-libs/zlib
160 - virtual/libelf
161 -"
162 -DEPEND="${RDEPEND}
163 - sys-devel/clang:10
164 - sys-devel/llvm:10
165 -"
166 -
167 -PATCHES=(
168 - "${FILESDIR}/${P}-install.patch"
169 - "${FILESDIR}/${P}-readelf.patch"
170 -)
171 -
172 -S="${WORKDIR}/xdp-tools-${MY_COMMIT}"
173 -
174 -pkg_setup() {
175 - llvm_pkg_setup
176 -}
177 -
178 -src_configure() {
179 - ./configure || die
180 -}
181 -
182 -src_compile() {
183 - emake \
184 - CC="$(tc-getCC)" \
185 - AR="$(tc-getAR)" \
186 - READELF=$(tc-getREADELF) \
187 - PRODUCTION=1 \
188 - DYNAMIC_LIBXDP=1 \
189 - FORCE_SYSTEM_LIBBPF=1 \
190 - PREFIX=/usr \
191 - LIBDIR="/usr/$(get_libdir)" all
192 -}
193 -
194 -src_install() {
195 - emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
196 -}