commit:     7a91ea058ddf91519866c8ab1cb41d41b0013d8c
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 18:18:15 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 18:33:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a91ea05

dev-util/bpftool: Version bump to 5.14.1

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/bpftool/Manifest              |   2 +
 dev-util/bpftool/bpftool-5.14.1.ebuild | 117 +++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 679a5f7a7e4..03ae2987776 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,4 @@
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 
842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b
 SHA512 
be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524
 SHA512 
8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST patch-5.12.xz 6263608 BLAKE2B 
cc46642f352e579b073695e8ca23ede26ec84c7f8f79b969aa334a49879d2d5838bb1e3411dae7c1c0584193a4b08aed031eda33b6f38fea4c9b36ed236045d5
 SHA512 
68f4832e07c152e2df097097720c6adb9103b6a56f5056af67ffa9afbca66ab7c1a94968f638de14d4cd93a077c820f58ffc32952a87721004714339b9d18487
+DIST patch-5.14.1.xz 4708 BLAKE2B 
334d56ba26abc0d29432c27a31fefff332d9b134899b6f0d5fdeadaf68c3bf95eaeba37a9500eb3c245ae2eea70786c55056586ce747277e9f2be16697ceab73
 SHA512 
409108139ba2842d100d69e47d88eee87bea58c210a84e242c82aae48fe4bc57ccd0a507c4a0ecb791d0a2962f46cda3ba900f728a9b6856e986bff018a2d19c

diff --git a/dev-util/bpftool/bpftool-5.14.1.ebuild 
b/dev-util/bpftool/bpftool-5.14.1.ebuild
new file mode 100644
index 00000000000..e3fa3487cfe
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.14.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/";
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}";
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}";
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+       sys-libs/binutils-libs:=
+       sys-libs/zlib:=
+       virtual/libelf:=
+       caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+       ${RDEPEND}
+       >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+       ${LINUX_PATCH+dev-util/patchutils}
+       ${PYTHON_DEPS}
+       dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+       local paths=(
+               tools/bpf kernel/bpf
+               tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+       )
+
+       # We expect the tar implementation to support the -j option (both
+       # GNU tar and libarchive's tar support that).
+       echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+       tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+               "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+       if [[ -n ${LINUX_PATCH} ]] ; then
+               eshopts_push -o noglob
+               ebegin "Filtering partial source patch"
+               filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+                       > ${P}.patch
+               eend $? || die "filterdiff failed"
+               eshopts_pop
+       fi
+
+       local a
+       for a in ${A}; do
+               [[ ${a} == ${LINUX_SOURCES} ]] && continue
+               [[ ${a} == ${LINUX_PATCH} ]] && continue
+               unpack ${a}
+       done
+}
+
+src_prepare() {
+       default
+
+       if [[ -n ${LINUX_PATCH} ]] ; then
+               pushd "${S_K}" >/dev/null || die
+               eapply "${WORKDIR}"/${P}.patch
+               popd || die
+       fi
+
+       # dev-python/docutils installs rst2man.py, not rst2man
+       sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+       local arch=$(tc-arch-kernel)
+       tc-export AR CC LD
+
+       emake V=1 VF=1 \
+               HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+               EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" 
BPFTOOL_VERSION="${MY_PV}" \
+               prefix="${EPREFIX}"/usr \
+               feature-libcap="$(usex caps 1 0)" \
+               "$@"
+}
+
+src_compile() {
+       bpftool_make
+       bpftool_make -C Documentation
+}
+
+src_install() {
+       bpftool_make DESTDIR="${D}" install
+       bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
+}
+
+pkg_postinst() {
+       optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
+}

Reply via email to