1 |
commit: 58ca1b8eda8b6242d59f94b0dbd5b570012218ad |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 21:30:37 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 22:21:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ca1b8e |
7 |
|
8 |
dev-util/bpftool: drop 5.16.14, 5.17.1 |
9 |
|
10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
11 |
|
12 |
dev-util/bpftool/Manifest | 2 - |
13 |
dev-util/bpftool/bpftool-5.16.14.ebuild | 117 -------------------------------- |
14 |
dev-util/bpftool/bpftool-5.17.1.ebuild | 117 -------------------------------- |
15 |
3 files changed, 236 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest |
18 |
index 510971ecc9b9..ce726ec47e97 100644 |
19 |
--- a/dev-util/bpftool/Manifest |
20 |
+++ b/dev-util/bpftool/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf |
23 |
DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b |
24 |
-DIST patch-5.16.14.xz 685480 BLAKE2B 5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5 SHA512 e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2 |
25 |
DIST patch-5.16.15.xz 721632 BLAKE2B 650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25 SHA512 e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520 |
26 |
-DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f |
27 |
DIST patch-5.17.4.xz 547280 BLAKE2B 453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f SHA512 9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465 |
28 |
|
29 |
diff --git a/dev-util/bpftool/bpftool-5.16.14.ebuild b/dev-util/bpftool/bpftool-5.16.14.ebuild |
30 |
deleted file mode 100644 |
31 |
index 6e1462d1df87..000000000000 |
32 |
--- a/dev-util/bpftool/bpftool-5.16.14.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,117 +0,0 @@ |
35 |
-# Copyright 2021-2022 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=8 |
39 |
- |
40 |
-PYTHON_COMPAT=( python3_{8..10} ) |
41 |
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs |
42 |
- |
43 |
-MY_PV="${PV/_/-}" |
44 |
-MY_PV="${MY_PV/-pre/-git}" |
45 |
- |
46 |
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps" |
47 |
-HOMEPAGE="https://kernel.org/" |
48 |
- |
49 |
-LINUX_V="${PV:0:1}.x" |
50 |
-LINUX_VER=$(ver_cut 1-2) |
51 |
-LINUX_PATCH=patch-${PV}.xz |
52 |
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" |
53 |
- |
54 |
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" |
55 |
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" |
56 |
- |
57 |
-S_K="${WORKDIR}/linux-${LINUX_VER}" |
58 |
-S="${S_K}/tools/bpf/bpftool" |
59 |
- |
60 |
-LICENSE="GPL-2" |
61 |
-SLOT="0" |
62 |
-KEYWORDS="amd64 ~x86" |
63 |
-IUSE="caps" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- sys-libs/binutils-libs:= |
67 |
- sys-libs/zlib:= |
68 |
- virtual/libelf:= |
69 |
- caps? ( sys-libs/libcap:= ) |
70 |
-" |
71 |
-DEPEND=" |
72 |
- ${RDEPEND} |
73 |
- >=sys-kernel/linux-headers-5.8 |
74 |
-" |
75 |
-BDEPEND=" |
76 |
- ${LINUX_PATCH+dev-util/patchutils} |
77 |
- ${PYTHON_DEPS} |
78 |
- dev-python/docutils |
79 |
-" |
80 |
- |
81 |
-CONFIG_CHECK="~DEBUG_INFO_BTF" |
82 |
- |
83 |
-# src_unpack and src_prepare are copied from dev-util/perf since |
84 |
-# it's building from the same tarball, please keep it in sync with perf |
85 |
-src_unpack() { |
86 |
- local paths=( |
87 |
- tools/bpf kernel/bpf |
88 |
- tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" |
89 |
- ) |
90 |
- |
91 |
- # We expect the tar implementation to support the -j option (both |
92 |
- # GNU tar and libarchive's tar support that). |
93 |
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" |
94 |
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ |
95 |
- "${paths[@]/#/linux-${LINUX_VER}/}" || die |
96 |
- |
97 |
- if [[ -n ${LINUX_PATCH} ]] ; then |
98 |
- eshopts_push -o noglob |
99 |
- ebegin "Filtering partial source patch" |
100 |
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ |
101 |
- > ${P}.patch |
102 |
- eend $? || die "filterdiff failed" |
103 |
- eshopts_pop |
104 |
- fi |
105 |
- |
106 |
- local a |
107 |
- for a in ${A}; do |
108 |
- [[ ${a} == ${LINUX_SOURCES} ]] && continue |
109 |
- [[ ${a} == ${LINUX_PATCH} ]] && continue |
110 |
- unpack ${a} |
111 |
- done |
112 |
-} |
113 |
- |
114 |
-src_prepare() { |
115 |
- default |
116 |
- |
117 |
- if [[ -n ${LINUX_PATCH} ]] ; then |
118 |
- pushd "${S_K}" >/dev/null || die |
119 |
- eapply "${WORKDIR}"/${P}.patch |
120 |
- popd || die |
121 |
- fi |
122 |
- |
123 |
- # dev-python/docutils installs rst2man.py, not rst2man |
124 |
- sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die |
125 |
-} |
126 |
- |
127 |
-bpftool_make() { |
128 |
- local arch=$(tc-arch-kernel) |
129 |
- tc-export AR CC LD |
130 |
- |
131 |
- emake V=1 VF=1 \ |
132 |
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ |
133 |
- EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ |
134 |
- prefix="${EPREFIX}"/usr \ |
135 |
- feature-libcap="$(usex caps 1 0)" \ |
136 |
- "$@" |
137 |
-} |
138 |
- |
139 |
-src_compile() { |
140 |
- bpftool_make |
141 |
- bpftool_make -C Documentation |
142 |
-} |
143 |
- |
144 |
-src_install() { |
145 |
- bpftool_make DESTDIR="${D}" install |
146 |
- bpftool_make mandir="${ED}"/usr/share/man -C Documentation install |
147 |
-} |
148 |
- |
149 |
-pkg_postinst() { |
150 |
- optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] |
151 |
-} |
152 |
|
153 |
diff --git a/dev-util/bpftool/bpftool-5.17.1.ebuild b/dev-util/bpftool/bpftool-5.17.1.ebuild |
154 |
deleted file mode 100644 |
155 |
index d4a6b8926868..000000000000 |
156 |
--- a/dev-util/bpftool/bpftool-5.17.1.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,117 +0,0 @@ |
159 |
-# Copyright 2021-2022 Gentoo Authors |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
- |
162 |
-EAPI=8 |
163 |
- |
164 |
-PYTHON_COMPAT=( python3_{8..10} ) |
165 |
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs |
166 |
- |
167 |
-MY_PV="${PV/_/-}" |
168 |
-MY_PV="${MY_PV/-pre/-git}" |
169 |
- |
170 |
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps" |
171 |
-HOMEPAGE="https://kernel.org/" |
172 |
- |
173 |
-LINUX_V="${PV:0:1}.x" |
174 |
-LINUX_VER=$(ver_cut 1-2) |
175 |
-LINUX_PATCH=patch-${PV}.xz |
176 |
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" |
177 |
- |
178 |
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" |
179 |
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" |
180 |
- |
181 |
-S_K="${WORKDIR}/linux-${LINUX_VER}" |
182 |
-S="${S_K}/tools/bpf/bpftool" |
183 |
- |
184 |
-LICENSE="GPL-2" |
185 |
-SLOT="0" |
186 |
-KEYWORDS="~amd64 ~x86" |
187 |
-IUSE="caps" |
188 |
- |
189 |
-RDEPEND=" |
190 |
- sys-libs/binutils-libs:= |
191 |
- sys-libs/zlib:= |
192 |
- virtual/libelf:= |
193 |
- caps? ( sys-libs/libcap:= ) |
194 |
-" |
195 |
-DEPEND=" |
196 |
- ${RDEPEND} |
197 |
- >=sys-kernel/linux-headers-5.8 |
198 |
-" |
199 |
-BDEPEND=" |
200 |
- ${LINUX_PATCH+dev-util/patchutils} |
201 |
- ${PYTHON_DEPS} |
202 |
- dev-python/docutils |
203 |
-" |
204 |
- |
205 |
-CONFIG_CHECK="~DEBUG_INFO_BTF" |
206 |
- |
207 |
-# src_unpack and src_prepare are copied from dev-util/perf since |
208 |
-# it's building from the same tarball, please keep it in sync with perf |
209 |
-src_unpack() { |
210 |
- local paths=( |
211 |
- tools/bpf kernel/bpf |
212 |
- tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" |
213 |
- ) |
214 |
- |
215 |
- # We expect the tar implementation to support the -j option (both |
216 |
- # GNU tar and libarchive's tar support that). |
217 |
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" |
218 |
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ |
219 |
- "${paths[@]/#/linux-${LINUX_VER}/}" || die |
220 |
- |
221 |
- if [[ -n ${LINUX_PATCH} ]] ; then |
222 |
- eshopts_push -o noglob |
223 |
- ebegin "Filtering partial source patch" |
224 |
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ |
225 |
- > ${P}.patch |
226 |
- eend $? || die "filterdiff failed" |
227 |
- eshopts_pop |
228 |
- fi |
229 |
- |
230 |
- local a |
231 |
- for a in ${A}; do |
232 |
- [[ ${a} == ${LINUX_SOURCES} ]] && continue |
233 |
- [[ ${a} == ${LINUX_PATCH} ]] && continue |
234 |
- unpack ${a} |
235 |
- done |
236 |
-} |
237 |
- |
238 |
-src_prepare() { |
239 |
- default |
240 |
- |
241 |
- if [[ -n ${LINUX_PATCH} ]] ; then |
242 |
- pushd "${S_K}" >/dev/null || die |
243 |
- eapply "${WORKDIR}"/${P}.patch |
244 |
- popd || die |
245 |
- fi |
246 |
- |
247 |
- # dev-python/docutils installs rst2man.py, not rst2man |
248 |
- sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die |
249 |
-} |
250 |
- |
251 |
-bpftool_make() { |
252 |
- local arch=$(tc-arch-kernel) |
253 |
- tc-export AR CC LD |
254 |
- |
255 |
- emake V=1 VF=1 \ |
256 |
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ |
257 |
- EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ |
258 |
- prefix="${EPREFIX}"/usr \ |
259 |
- feature-libcap="$(usex caps 1 0)" \ |
260 |
- "$@" |
261 |
-} |
262 |
- |
263 |
-src_compile() { |
264 |
- bpftool_make |
265 |
- bpftool_make -C Documentation |
266 |
-} |
267 |
- |
268 |
-src_install() { |
269 |
- bpftool_make DESTDIR="${D}" install |
270 |
- bpftool_make mandir="${ED}"/usr/share/man -C Documentation install |
271 |
-} |
272 |
- |
273 |
-pkg_postinst() { |
274 |
- optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] |
275 |
-} |