summaryrefslogtreecommitdiff
path: root/dev-util/bpftool
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-30 00:00:01 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-30 00:00:01 +0100
commit4c2b70adc6484c35ff05e412de08a7b7f50cfb34 (patch)
treec7557ae36b9b2bfa7134849511e79da938581c5f /dev-util/bpftool
parent5f0030fd1370c4d03dbb2e0d3086f5e618a33749 (diff)
gentoo auto-resync : 30:04:2024 - 00:00:01
Diffstat (limited to 'dev-util/bpftool')
-rw-r--r--dev-util/bpftool/Manifest9
-rw-r--r--dev-util/bpftool/bpftool-6.5.7.ebuild118
-rw-r--r--dev-util/bpftool/bpftool-6.8.2.ebuild (renamed from dev-util/bpftool/bpftool-6.6.8.ebuild)12
3 files changed, 10 insertions, 129 deletions
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index bf47fa16d119..167cf953de76 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,10 +1,7 @@
-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 linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
DIST patch-6.7.6.xz 583872 BLAKE2B 123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2 SHA512 ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
-EBUILD bpftool-6.5.7.ebuild 2903 BLAKE2B 87f95b114db4f37815ef0f9d35a3b32e9a1f89fa7f0210ec2520a1b9b5bea948197159ffff8871f755bd127fb1041c3e7b0942f0148f406a937d1706c4acb677 SHA512 67b56ea325d71a5f27c2004ad2743e35cd14ceddfb72ecc631e172422953f5af04b428ad804f41666d1bd3a2f33c20b32b217fc339af51aaec4c03187dde4e17
-EBUILD bpftool-6.6.8.ebuild 2993 BLAKE2B 33efe3ddf3f948573c41b37d50187833f06b419141b2ebedf5ca341d903fb2b3d2761518c10db5100c0378f3032cc97e1ef5284c033f9f8b0de65376b7803fc2 SHA512 22bcd2f98e7fc08c9eb9807646e9c0ab9573431b11a03a0227c38072d6a94be50f5d1f98c8f98146a983bd46da36ca0af28cab8513f427405c560f42c238bddb
+DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac SHA512 a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
EBUILD bpftool-6.7.6-r1.ebuild 3058 BLAKE2B 2fefd15fd034b172369c9b6c0f7bcc3f5c789b8272e5cc30cbada66dcf33d889faec5f47a3b8ba56f50af67d91e49ee56e31ca81e7e84106c7878944201ff72c SHA512 b8f93e8ec6e2fa3442c193498d08cb04485bf53ed4914e85074a0433d73e6f9f54b5dfb37d9bcb39b09ac51a756671b7e52f8c4157d5b124ecfbf3ea4e5a6a72
+EBUILD bpftool-6.8.2.ebuild 3084 BLAKE2B 738223c4c8735d4b038eea2a1715c60be154ab2d4f5d028c93cdc0c9d4b5252f755c5f40ffb739378615d483cd4acd66474292074a12cc506b672e757a513166 SHA512 142866c60bedbd38363c136e5d4b909d7375ed0f60412036d3768d445bcf3e4eadfced18ff7c99899dfb53712ecfad798ea5e14b66ba225beac17e6e31e5480b
MISC metadata.xml 413 BLAKE2B a5ec0a493a8362f9ba27b636aa1cacfe55c7c9e3dfaa0f789174be4bf0742bd70fd84991d22e99382cbbd3b07c8ed9873e4ebe4b8642b3925111cdf92a09b96e SHA512 130622d6ec59149edf404fa09c51e532c47ff549eb843b7dd3dc71a1bc59b0e80bca54e741f78e21521f940f39c71684e85c433e2923ce3470a9cd55cae99087
diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild b/dev-util/bpftool/bpftool-6.5.7.ebuild
deleted file mode 100644
index 01823047c46c..000000000000
--- a/dev-util/bpftool/bpftool-6.5.7.ebuild
+++ /dev/null
@@ -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]
-}
diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild b/dev-util/bpftool/bpftool-6.8.2.ebuild
index 6bccebe1c3cf..d9eba8e311ae 100644
--- a/dev-util/bpftool/bpftool-6.6.8.ebuild
+++ b/dev-util/bpftool/bpftool-6.8.2.ebuild
@@ -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}
@@ -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' || 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)" \
"$@"
}