mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 00:51:41 +02:00
dev-util/bpftool: Sync with Gentoo
It's from Gentoo commit dedb1b9db44bfac952b93aebe8dd1a57dbe7a33a.
This commit is contained in:
Flatcar Buildbot
Mathieu Tortuyaux
parent
8532cfb7b9
commit
b8c919de44
@ -1,6 +1,4 @@
|
||||
DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
|
||||
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
|
||||
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
|
||||
DIST patch-6.5.7.xz 561404 BLAKE2B 98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175 SHA512 4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
|
||||
DIST patch-6.6.8.xz 587540 BLAKE2B 4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae SHA512 1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe
|
||||
DIST patch-6.7.6.xz 583872 BLAKE2B 123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2 SHA512 ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
|
||||
DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
|
||||
DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
|
||||
DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac SHA512 a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
|
||||
DIST patch-6.9.2.xz 16184 BLAKE2B 8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9 SHA512 a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
# 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 ~loong ~ppc ~ppc64 ~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
|
||||
|
||||
# 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]
|
||||
}
|
||||
@ -87,8 +87,8 @@ src_prepare() {
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# dev-python/docutils installs rst2man.py, not rst2man
|
||||
sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
|
||||
# Use rst2man or rst2man.py depending on which one exists (#930076)
|
||||
type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
|
||||
|
||||
# remove -Werror (bug 887981)
|
||||
sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
|
||||
@ -1,9 +1,9 @@
|
||||
# Copyright 2021-2023 Gentoo Authors
|
||||
# Copyright 2021-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
|
||||
|
||||
MY_PV="${PV/_/-}"
|
||||
@ -26,13 +26,14 @@ S="${S_K}/tools/bpf/bpftool"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
IUSE="caps"
|
||||
IUSE="caps +llvm"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/binutils-libs:=
|
||||
sys-libs/zlib:=
|
||||
virtual/libelf:=
|
||||
caps? ( sys-libs/libcap:= )
|
||||
llvm? ( sys-devel/llvm:= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
@ -51,8 +52,8 @@ CONFIG_CHECK="~DEBUG_INFO_BTF"
|
||||
# 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"
|
||||
kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
|
||||
scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
|
||||
)
|
||||
|
||||
# We expect the tar implementation to support the -j and --wildcards option
|
||||
@ -86,8 +87,8 @@ src_prepare() {
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# dev-python/docutils installs rst2man.py, not rst2man
|
||||
sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
|
||||
# Use rst2man or rst2man.py depending on which one exists (#930076)
|
||||
type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
|
||||
|
||||
# remove -Werror (bug 887981)
|
||||
sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
|
||||
@ -103,6 +104,7 @@ bpftool_make() {
|
||||
prefix="${EPREFIX}"/usr \
|
||||
bash_compdir="$(get_bashcompdir)" \
|
||||
feature-libcap="$(usex caps 1 0)" \
|
||||
feature-llvm="$(usex llvm 1 0)" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>jsmolic@gentoo.org</email>
|
||||
<name>Jakov Smolić</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
<use>
|
||||
<flag name="caps">Use <pkg>sys-libs/libcap</pkg> to enable unprivileged run support</flag>
|
||||
<flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user