dev-util/bpftool: Sync with Gentoo

It's from Gentoo commit 59562ff709bac6eb61bafe8e3425c0f17a4853b3.
This commit is contained in:
Flatcar Buildbot 2025-08-04 07:14:21 +00:00 committed by Krzesimir Nowak
parent 9201757ea5
commit fb74f4f0cb
4 changed files with 153 additions and 2 deletions

View File

@ -1 +1,2 @@
DIST bpftool-libbpf-v7.5.0-sources.tar.gz 1510032 BLAKE2B cc9beac4034317f89ae3c1088d1b1a1948778bcdb51d7ed7f566e4e5ab720c1128ca467d51d0bc3ffe7b1f69800249362baef5dfaf858275050f96b744fdbca6 SHA512 db12c305b77fea3689dbc1ce94527f0f21fa9de21fcdb36385e3fe492137335bb393f90e456c06601495ccc984230a531c432709db6514b545e0aeeda7ca3c99
DIST bpftool-libbpf-v7.6.0-sources.tar.gz 1527883 BLAKE2B 5918519009b1ee258c33506cb52d216b08fbcd6365083a71d74b11e2c788fd4c6f7cfd78c84bb85074eb463dfa8d087b8e35c79d00f3a0810979640af6b334e6 SHA512 d443601227acd9a0db15896da186b0a47d426c44f2b6eaa822391594aa23d617a94ee94f284abb841529d41ef7c585a1087dd5ab1708ce068cc02b3c08b0a51b

View File

@ -5,7 +5,7 @@ EAPI=8
LLVM_COMPAT=( {15..20} )
LLVM_OPTIONAL=1
PYTHON_COMPAT=( python3_{11..13} )
PYTHON_COMPAT=( python3_{11..14} )
inherit bash-completion-r1 linux-info llvm-r1 python-any-r1 toolchain-funcs

View File

@ -0,0 +1,150 @@
# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LLVM_COMPAT=( {15..20} )
LLVM_OPTIONAL=1
PYTHON_COMPAT=( python3_{11..14} )
inherit bash-completion-r1 linux-info llvm-r1 python-any-r1 toolchain-funcs
DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
HOMEPAGE="https://github.com/libbpf/bpftool"
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/libbpf/bpftool.git"
EGIT_SUBMODULES=(libbpf)
else
# bpftool typically vendors whatever libbpf is current at the time
# of a release, while libbpf publishes minor updates more frequently.
# Uncomment the following to bundle an updated libbpf e.g. in case of
# security or crasher bugs in libbpf and to keep the two synchronized.
# This allows us to quickly update the vendored lib with a revbump.
# Currently bpftool-x.y vendors libbpf-1.y; DO NOT mix different y versions.
# See the libbpf repo (https://github.com/libbpf/libbpf) for possible updates.
# LIBBPF_VERSION=1.5.0
if [[ ! -z ${LIBBPF_VERSION} ]] ; then
SRC_URI="https://github.com/libbpf/bpftool/archive/refs/tags/v${PV}.tar.gz -> bpftool-${PV}.tar.gz
https://github.com/libbpf/libbpf/archive/refs/tags/v${LIBBPF_VERSION}.tar.gz
-> libbpf-${LIBBPF_VERSION}.tar.gz"
else
# use tarball with bundled libbpf
SRC_URI="https://github.com/libbpf/bpftool/releases/download/v${PV}/bpftool-libbpf-v${PV}-sources.tar.gz"
S="${WORKDIR}/bpftool-libbpf-v${PV}-sources"
fi
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="|| ( GPL-2 BSD-2 )"
SLOT="0"
IUSE="caps +clang llvm"
REQUIRED_USE="llvm? ( ${LLVM_REQUIRED_USE} )"
RDEPEND="
caps? ( sys-libs/libcap:= )
llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}') )
!llvm? ( sys-libs/binutils-libs:= )
sys-libs/zlib:=
virtual/libelf:=
"
DEPEND="
${RDEPEND}
>=sys-kernel/linux-headers-5.8
"
BDEPEND="
${PYTHON_DEPS}
app-arch/tar
dev-python/docutils
clang? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}[llvm_targets_BPF]') )
!clang? ( sys-devel/bpf-toolchain )
"
CONFIG_CHECK="~DEBUG_INFO_BTF"
pkg_setup() {
python-any-r1_pkg_setup
use llvm && llvm-r1_pkg_setup
}
src_prepare() {
default
# prepare libbpf if necessary
if [[ ! -z ${LIBBPF_VERSION} ]] ; then
rm -rf libbpf || die
ln -s "${WORKDIR}/libbpf-${LIBBPF_VERSION}" libbpf || die
fi
# remove -Werror from libbpf (bug 887981)
sed -i -e 's/\-Werror//g' libbpf/src/Makefile || die
# remove -Werror from bpftool feature detection
sed -i -e 's/-Werror//g' src/Makefile.feature || die
# remove hardcoded/unhelpful flags from bpftool
sed -i -e '/CFLAGS += -O2/d' -e 's/-W //g' -e 's/-Wextra //g' src/Makefile || die
# always build bpf bits with std=gnu11 for kernel compatibility (bug 955156)
sed -i 's/-fno-stack-protector/& -std=gnu11/g' src/Makefile || die
if ! use clang; then
# make people aware of what they are doing
ewarn "Using bpf-toolchain instead of clang due to USE=-clang."
ewarn "Please report any odd behaviours you observe, since using gcc for BPF"
ewarn "is still under development in both the Linux kernel and gcc itself."
# prevent attribute warning about preserve_access_index
# since gcc does not support '#pragma clang attribute push':
# https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=675b4e2
sed -i 's/std=gnu11/& -DBPF_NO_PRESERVE_ACCESS_INDEX/g' src/Makefile || die
# remove bpf target & add assembly annotations to fix CO-RE feature detection
sed -i -e 's/-target bpf/-dA/' src/Makefile.feature || die
# remove bpf target from skeleton build
sed -i -e 's/--target=bpf//g' src/Makefile || die
fi
# Use rst2man or rst2man.py depending on which one exists (#930076)
type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' docs/Makefile || die
}
bpftool_make() {
# which BPF compiler should we use?
if use clang; then
export CLANG="$(get_llvm_prefix -b)/bin/clang"
export LLVM_STRIP="$(get_llvm_prefix -b)/bin/llvm-strip"
else
# use bpf-toolchain
export CLANG="bpf-unknown-none-gcc"
export LLVM_STRIP="bpf-unknown-none-strip"
fi
tc-export AR CC LD
emake \
ARCH="$(tc-arch-kernel)" \
HOSTAR="$(tc-getBUILD_AR)" \
HOSTCC="$(tc-getBUILD_CC)" \
HOSTLD="$(tc-getBUILD_LD)" \
bash_compdir="$(get_bashcompdir)" \
feature-libcap="$(usex caps 1 0)" \
feature-llvm="$(usex llvm 1 0)" \
prefix="${EPREFIX}"/usr \
V=1 \
"$@"
}
src_compile() {
bpftool_make -C src
bpftool_make -C docs
}
src_install() {
bpftool_make DESTDIR="${D}" -C src install
bpftool_make mandir="${ED}"/usr/share/man -C docs install
}

View File

@ -5,7 +5,7 @@ EAPI=8
LLVM_COMPAT=( {15..20} )
LLVM_OPTIONAL=1
PYTHON_COMPAT=( python3_{11..13} )
PYTHON_COMPAT=( python3_{11..14} )
inherit bash-completion-r1 linux-info llvm-r1 python-any-r1 toolchain-funcs