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