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