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, 14 Sep 2021 18:37:18
Message-Id: 1631644432.7a91ea058ddf91519866c8ab1cb41d41b0013d8c.jsmolic@gentoo
1 commit: 7a91ea058ddf91519866c8ab1cb41d41b0013d8c
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 14 18:18:15 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 14 18:33:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a91ea05
7
8 dev-util/bpftool: Version bump to 5.14.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.14.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 679a5f7a7e4..03ae2987776 100644
18 --- a/dev-util/bpftool/Manifest
19 +++ b/dev-util/bpftool/Manifest
20 @@ -1,2 +1,4 @@
21 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
22 +DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
23 DIST patch-5.12.xz 6263608 BLAKE2B cc46642f352e579b073695e8ca23ede26ec84c7f8f79b969aa334a49879d2d5838bb1e3411dae7c1c0584193a4b08aed031eda33b6f38fea4c9b36ed236045d5 SHA512 68f4832e07c152e2df097097720c6adb9103b6a56f5056af67ffa9afbca66ab7c1a94968f638de14d4cd93a077c820f58ffc32952a87721004714339b9d18487
24 +DIST patch-5.14.1.xz 4708 BLAKE2B 334d56ba26abc0d29432c27a31fefff332d9b134899b6f0d5fdeadaf68c3bf95eaeba37a9500eb3c245ae2eea70786c55056586ce747277e9f2be16697ceab73 SHA512 409108139ba2842d100d69e47d88eee87bea58c210a84e242c82aae48fe4bc57ccd0a507c4a0ecb791d0a2962f46cda3ba900f728a9b6856e986bff018a2d19c
25
26 diff --git a/dev-util/bpftool/bpftool-5.14.1.ebuild b/dev-util/bpftool/bpftool-5.14.1.ebuild
27 new file mode 100644
28 index 00000000000..e3fa3487cfe
29 --- /dev/null
30 +++ b/dev-util/bpftool/bpftool-5.14.1.ebuild
31 @@ -0,0 +1,117 @@
32 +# Copyright 2021 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 +}