From 7d040c2d1b0c38c8635ec28dfaa632a2db8be895 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Apr 2023 23:39:55 +0100 Subject: gentoo auto-resync : 11:04:2023 - 23:39:54 --- dev-util/bpftool/Manifest | 6 +- dev-util/bpftool/bpftool-5.19.12.ebuild | 127 -------------------------------- dev-util/bpftool/bpftool-6.2.1.ebuild | 2 +- 3 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 dev-util/bpftool/bpftool-5.19.12.ebuild (limited to 'dev-util/bpftool') diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest index 7c1c7811fbc8..7b1eb226cc91 100644 --- a/dev-util/bpftool/Manifest +++ b/dev-util/bpftool/Manifest @@ -1,9 +1,5 @@ AUX 5.19.12-no-stack-protector.patch 517 BLAKE2B 5d47108db32a2c33a0151997c26da2d1f9944b4796e6b0e4c90a8dc8edfc0a0cfc78be248dd484e1b55038f64e226633e9b7d792bed980b875d9d628e04ee376 SHA512 155cf0d515b9c644fcfe233c0f2a05b2b6ffecfc634f0320b32e3dcbfcf7807896bc2d09a70f139af62d9c743c1fcdafade890dcedd73bb240f38b55b1ee6a2a -DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd -DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc DIST patch-6.2.1.xz 5688 BLAKE2B 383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90 SHA512 e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085 -DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b -EBUILD bpftool-5.19.12.ebuild 3256 BLAKE2B a2fc604b44b8539de5cc03eb0b408dd4c0247cbabc238e2e189ec948e4cd3511b55a04a41dc807475d76f403bdc484d9bd2d4f8c17c7f6ecef53639b17ce9054 SHA512 0f6978a5286575a5f8ac91ceb44ff55349d43fbb416eb9da3e95ee682ee059237f7858033a1e9d0846c2c0e63d6dcef4a64187fb16f31a22fab81dd7646fc649 -EBUILD bpftool-6.2.1.ebuild 3003 BLAKE2B 4a4e2c20ada14d20cbdba794ca3e48b9da6096436eb624f958c0186d3953e05390cff04662fb93d6d2c287ca7dca201fb47101156faf3dc1d7fb3fdfc6bc8e2a SHA512 ebd77d297593d5366d2cf62721aad65426feabd454d8f28cdd25c50f68f2632b447eb9ce7df15fc2210f6ce1e999057ce1b2373b18a679719be7f8645b564519 +EBUILD bpftool-6.2.1.ebuild 3002 BLAKE2B 8f0afdbdb41176ff1ed27224b310c88b67c44214d9ad82ba4bca353ba02f04e666b2c19f16e66d68e4cd7540412d7f6ee0eef3ce71048dcadd75f4594909c681 SHA512 604498cf1ba5b83edb808480577395f1d85b59644f06bd3d2d21a843f3062ca3d85f1390e09bc917c8ec2324c56cca4a45b79ee3b6c57311a85d4ce979c5751c MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild deleted file mode 100644 index fa8315db60c6..000000000000 --- a/dev-util/bpftool/bpftool-5.19.12.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -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}" - -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/bpf/bpftool" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~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 - - pushd "${S_K}" >/dev/null || die - # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00` - # bug #868123 - eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches - eapply "${FILESDIR}"/${PV}-no-stack-protector.patch - popd || die - - # 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.2.1.ebuild b/dev-util/bpftool/bpftool-6.2.1.ebuild index 5e04ebcc3cf1..ac56b1006ed3 100644 --- a/dev-util/bpftool/bpftool-6.2.1.ebuild +++ b/dev-util/bpftool/bpftool-6.2.1.ebuild @@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" IUSE="caps" RDEPEND=" -- cgit v1.2.3