commit: 6dd9e0a038bff6b6428654207aa55c02d0e4cb06
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 08:53:08 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 18:48:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd9e0a0
dev-util/bpftool: drop 6.5.7, 6.6.8
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/bpftool/Manifest | 4 --
dev-util/bpftool/bpftool-6.5.7.ebuild | 118 ---------------------------------
dev-util/bpftool/bpftool-6.6.8.ebuild | 121 ----------------------------------
3 files changed, 243 deletions(-)
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6fcde0c77d11..e26e5e9ae35e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,2 @@
-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
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.6.8.ebuild
deleted file mode 100644
index 6bccebe1c3cf..000000000000
--- a/dev-util/bpftool/bpftool-6.6.8.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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
-
- # remove -Werror (bug 887981)
- sed -i -e 's/\-Werror//g' ../../lib/bpf/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]
-}
