commit:     383aa3a39d95af76597b402fe0d048e4933392ca
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 07:25:49 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 06:02:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383aa3a3

dev-util/bpftool: add 6.2.11

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

 dev-util/bpftool/Manifest              |   1 +
 dev-util/bpftool/bpftool-6.2.11.ebuild | 123 +++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index cb6a4e5c08b2..2083bea69d8d 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,3 @@
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
+DIST patch-6.2.11.xz 683356 BLAKE2B 
e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda
 SHA512 
86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6

diff --git a/dev-util/bpftool/bpftool-6.2.11.ebuild 
b/dev-util/bpftool/bpftool-6.2.11.ebuild
new file mode 100644
index 000000000000..5e04ebcc3cf1
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.2.11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-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 ~arm ~arm64 ~riscv ~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}
+       app-arch/tar
+       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 and --wildcards 
option
+       echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+       gtar --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
+
+       pushd "${S_K}" >/dev/null || die
+       # bug #890638
+       eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
+       popd || die
+
+       # 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 \
+               bash_compdir="$(get_bashcompdir)" \
+               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