Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/
Date: Mon, 29 Nov 2021 11:46:35
Message-Id: 1638186380.829e66a743c16f4586f861e402b459043351ed1f.jsmolic@gentoo
1 commit: 829e66a743c16f4586f861e402b459043351ed1f
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 29 11:45:16 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 29 11:46:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829e66a7
7
8 dev-util/bpftool: drop 5.15.2
9
10 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
11
12 dev-util/bpftool/Manifest | 1 -
13 dev-util/bpftool/bpftool-5.15.2.ebuild | 117 ---------------------------------
14 2 files changed, 118 deletions(-)
15
16 diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
17 index 97f022bbb18f..bf58d97ab0c5 100644
18 --- a/dev-util/bpftool/Manifest
19 +++ b/dev-util/bpftool/Manifest
20 @@ -1,5 +1,4 @@
21 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
22 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
23 DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
24 -DIST patch-5.15.2.xz 17244 BLAKE2B 769ef83b6613d865b420d048c25ac1df4c2f88f7ae580b373f874d312720bad877e561756943c9833535a94e5621922bba24cb1b804a1540f2e67cfa23f1a1aa SHA512 5f0123bdc7c9875e7b3f02a89496a8a1e0808d77dc58fb725e250d93d69510a1ef6462cfb38cb38e78e20ca34fd7446f58327cad5e67fc68ec36d15777048edf
25 DIST patch-5.15.3.xz 290732 BLAKE2B 62544d1c3187321db6b2dfc7f1d910ddbcfc2b9d2977087d0e1fba12dde33df2d74ea62ced1646243db68a8d386b22bc5c80a955c1e65e77084b06e224586d93 SHA512 cf8b69a3aa725e0ebbe767ac28b7b99de53ee2436a6883e54ee330d17bbdb4d88c147ef1082c3c02a20649ecdc1e363961d9b210e56018c92daff7b889ff2db5
26
27 diff --git a/dev-util/bpftool/bpftool-5.15.2.ebuild b/dev-util/bpftool/bpftool-5.15.2.ebuild
28 deleted file mode 100644
29 index e3fa3487cfe7..000000000000
30 --- a/dev-util/bpftool/bpftool-5.15.2.ebuild
31 +++ /dev/null
32 @@ -1,117 +0,0 @@
33 -# Copyright 2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -PYTHON_COMPAT=( python3_{8..10} )
39 -inherit estack linux-info optfeature python-any-r1 toolchain-funcs
40 -
41 -MY_PV="${PV/_/-}"
42 -MY_PV="${MY_PV/-pre/-git}"
43 -
44 -DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
45 -HOMEPAGE="https://kernel.org/"
46 -
47 -LINUX_V="${PV:0:1}.x"
48 -LINUX_VER=$(ver_cut 1-2)
49 -LINUX_PATCH=patch-${PV}.xz
50 -SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
51 -
52 -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
53 -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
54 -
55 -S_K="${WORKDIR}/linux-${LINUX_VER}"
56 -S="${S_K}/tools/bpf/bpftool"
57 -
58 -LICENSE="GPL-2"
59 -SLOT="0"
60 -KEYWORDS="~amd64 ~x86"
61 -IUSE="caps"
62 -
63 -RDEPEND="
64 - sys-libs/binutils-libs:=
65 - sys-libs/zlib:=
66 - virtual/libelf:=
67 - caps? ( sys-libs/libcap:= )
68 -"
69 -DEPEND="
70 - ${RDEPEND}
71 - >=sys-kernel/linux-headers-5.8
72 -"
73 -BDEPEND="
74 - ${LINUX_PATCH+dev-util/patchutils}
75 - ${PYTHON_DEPS}
76 - dev-python/docutils
77 -"
78 -
79 -CONFIG_CHECK="~DEBUG_INFO_BTF"
80 -
81 -# src_unpack and src_prepare are copied from dev-util/perf since
82 -# it's building from the same tarball, please keep it in sync with perf
83 -src_unpack() {
84 - local paths=(
85 - tools/bpf kernel/bpf
86 - tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
87 - )
88 -
89 - # We expect the tar implementation to support the -j option (both
90 - # GNU tar and libarchive's tar support that).
91 - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
92 - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
93 - "${paths[@]/#/linux-${LINUX_VER}/}" || die
94 -
95 - if [[ -n ${LINUX_PATCH} ]] ; then
96 - eshopts_push -o noglob
97 - ebegin "Filtering partial source patch"
98 - filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
99 - > ${P}.patch
100 - eend $? || die "filterdiff failed"
101 - eshopts_pop
102 - fi
103 -
104 - local a
105 - for a in ${A}; do
106 - [[ ${a} == ${LINUX_SOURCES} ]] && continue
107 - [[ ${a} == ${LINUX_PATCH} ]] && continue
108 - unpack ${a}
109 - done
110 -}
111 -
112 -src_prepare() {
113 - default
114 -
115 - if [[ -n ${LINUX_PATCH} ]] ; then
116 - pushd "${S_K}" >/dev/null || die
117 - eapply "${WORKDIR}"/${P}.patch
118 - popd || die
119 - fi
120 -
121 - # dev-python/docutils installs rst2man.py, not rst2man
122 - sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
123 -}
124 -
125 -bpftool_make() {
126 - local arch=$(tc-arch-kernel)
127 - tc-export AR CC LD
128 -
129 - emake V=1 VF=1 \
130 - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
131 - EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
132 - prefix="${EPREFIX}"/usr \
133 - feature-libcap="$(usex caps 1 0)" \
134 - "$@"
135 -}
136 -
137 -src_compile() {
138 - bpftool_make
139 - bpftool_make -C Documentation
140 -}
141 -
142 -src_install() {
143 - bpftool_make DESTDIR="${D}" install
144 - bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
145 -}
146 -
147 -pkg_postinst() {
148 - optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
149 -}