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: Tue, 18 Jan 2022 13:09:35
Message-Id: 1642511360.6205ed6120eb2e52e57f23b4039bc95900980ec1.jsmolic@gentoo
1 commit: 6205ed6120eb2e52e57f23b4039bc95900980ec1
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 13:02:54 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 13:09:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6205ed61
7
8 dev-util/bpftool: add 5.16.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.1.ebuild | 117 +++++++++++++++++++++++++++++++++
14 2 files changed, 119 insertions(+)
15
16 diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
17 index 322f4dfb2319..9d6f6469b007 100644
18 --- a/dev-util/bpftool/Manifest
19 +++ b/dev-util/bpftool/Manifest
20 @@ -1,5 +1,7 @@
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 linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
24 DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
25 DIST patch-5.15.12.xz 620100 BLAKE2B 8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468 SHA512 0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
26 DIST patch-5.15.8.xz 537596 BLAKE2B 0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72 SHA512 ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
27 +DIST patch-5.16.1.xz 10492 BLAKE2B dcdef3f247252ac7cbbdd7892fb017b8181ea4028d56b1d710144effaf59498c42703b85ea3ecaa85f513f1813dc4ce6bb24adbfe54395a119f9ad20d35ea523 SHA512 0506dd2b6758107cdd66bb75d51e263d77115c79529bd64f206119f809adb11fdeaa4cf4595d38051390bf9afca63b5af4d886a8e1a799caf0927d4858273b24
28
29 diff --git a/dev-util/bpftool/bpftool-5.16.1.ebuild b/dev-util/bpftool/bpftool-5.16.1.ebuild
30 new file mode 100644
31 index 000000000000..d4a6b8926868
32 --- /dev/null
33 +++ b/dev-util/bpftool/bpftool-5.16.1.ebuild
34 @@ -0,0 +1,117 @@
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 +}