From fa49bc1447d334c70e45ded349d3c37319dab7b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2024 23:40:38 +0000 Subject: gentoo auto-resync : 24:02:2024 - 23:40:37 --- dev-util/Manifest.gz | Bin 64605 -> 64606 bytes dev-util/bpftool/Manifest | 6 +- dev-util/bpftool/bpftool-6.6.8.ebuild | 5 +- dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 123 +++++++++++++++++++++++++++++++ dev-util/bpftool/bpftool-6.7.6.ebuild | 118 ----------------------------- dev-util/bpftool/metadata.xml | 1 + 6 files changed, 131 insertions(+), 122 deletions(-) create mode 100644 dev-util/bpftool/bpftool-6.7.6-r1.ebuild delete mode 100644 dev-util/bpftool/bpftool-6.7.6.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 9dd8903465a4..00f279e8cead 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest index 568f6bd6dfd4..f3ba0a7797f1 100644 --- a/dev-util/bpftool/Manifest +++ b/dev-util/bpftool/Manifest @@ -5,6 +5,6 @@ DIST patch-6.5.7.xz 561404 BLAKE2B 98f6fe0a43562cc60ada3596443e56966742de6ec2ef2 DIST patch-6.6.8.xz 587540 BLAKE2B 4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae SHA512 1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe 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 2904 BLAKE2B f5b3e6d184fd825c036dcb8e2dbde9c2d278530d3b6662285a1eaa1a5e0406118f2d2ecd1e327464b6f729308bde5260e5c90ee733ccdc3e06f31e23d5f53e95 SHA512 d5c5da1796fd52b9f7c414574f6d04f49203f05ace439a8409e699429b357afaf52008b7ff639b5ee5ba7088a0e64ef1def27cf175f2e917f799772095d095af -EBUILD bpftool-6.7.6.ebuild 2905 BLAKE2B 50bd404deb21b0ba46e0fa27b103acaaeb97e9930a89f46075baa4f84593428d2c41536c23e244745baa8de6d9cb5ccecc6bd8e6676648de0934473ab02b309a SHA512 d75ec07baa0a3b162fb2615eec581f717bc23e524d66e7f43f0a51aa418e6a9256821140f5334cb29585d414b77007fec94fc76ffaf900e074516578db19ae43 -MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be +EBUILD bpftool-6.6.8.ebuild 2993 BLAKE2B 33efe3ddf3f948573c41b37d50187833f06b419141b2ebedf5ca341d903fb2b3d2761518c10db5100c0378f3032cc97e1ef5284c033f9f8b0de65376b7803fc2 SHA512 22bcd2f98e7fc08c9eb9807646e9c0ab9573431b11a03a0227c38072d6a94be50f5d1f98c8f98146a983bd46da36ca0af28cab8513f427405c560f42c238bddb +EBUILD bpftool-6.7.6-r1.ebuild 3064 BLAKE2B 53f90c918ff3847e48595d2eb142eaa62275862abcf935fdde64eb621cd6d1c86fa3a3e4bc128ebbaf5d9a9c2987c2ecc5d95347b19ee811b3dc26c48b59d2ba SHA512 7d8b8a82458a0e9ed860fe19dfc903c59bb2547e9f61f3846e731baa0142143b33bb58d90adcf1646c4cd546fa3d4a119f4d40188be9476c70df280b32599a2b +MISC metadata.xml 413 BLAKE2B a5ec0a493a8362f9ba27b636aa1cacfe55c7c9e3dfaa0f789174be4bf0742bd70fd84991d22e99382cbbd3b07c8ed9873e4ebe4b8642b3925111cdf92a09b96e SHA512 130622d6ec59149edf404fa09c51e532c47ff549eb843b7dd3dc71a1bc59b0e80bca54e741f78e21521f940f39c71684e85c433e2923ce3470a9cd55cae99087 diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild b/dev-util/bpftool/bpftool-6.6.8.ebuild index 8d18340895fc..6bccebe1c3cf 100644 --- a/dev-util/bpftool/bpftool-6.6.8.ebuild +++ b/dev-util/bpftool/bpftool-6.6.8.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" @@ -88,6 +88,9 @@ src_prepare() { # 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() { diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild new file mode 100644 index 000000000000..acd42e33726c --- /dev/null +++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..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 +llvm" + +RDEPEND=" + sys-libs/binutils-libs:= + sys-libs/zlib:= + virtual/libelf:= + caps? ( sys-libs/libcap:= ) + llvm? ( sys-devel/llvm:= ) +" +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)" \ + feature-llvm="$(usex llvm 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.7.6.ebuild b/dev-util/bpftool/bpftool-6.7.6.ebuild deleted file mode 100644 index 97be10f5b785..000000000000 --- a/dev-util/bpftool/bpftool-6.7.6.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..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/metadata.xml b/dev-util/bpftool/metadata.xml index 5e14e3b3c659..bfc94c6cdaaf 100644 --- a/dev-util/bpftool/metadata.xml +++ b/dev-util/bpftool/metadata.xml @@ -7,5 +7,6 @@ Use sys-libs/libcap to enable unprivileged run support + Use sys-devel/llvm -- cgit v1.2.3