summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin69608 -> 69595 bytes
-rw-r--r--dev-util/bpftool/Manifest3
-rw-r--r--dev-util/bpftool/bpftool-6.5.7.ebuild118
-rw-r--r--dev-util/clippy/Manifest6
-rw-r--r--dev-util/clippy/clippy-8.5.2.ebuild53
-rw-r--r--dev-util/clippy/clippy-9.0.1.ebuild (renamed from dev-util/clippy/clippy-8.5.ebuild)4
6 files changed, 125 insertions, 59 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e49c441a6c46..9e35f24731fa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index feba43c4b3ff..f39388878b7e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,7 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
DIST patch-6.3.xz 8617176 BLAKE2B cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3 SHA512 4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
+DIST patch-6.5.7.xz 561404 BLAKE2B 98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175 SHA512 4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
EBUILD bpftool-6.3.ebuild 2903 BLAKE2B 87f95b114db4f37815ef0f9d35a3b32e9a1f89fa7f0210ec2520a1b9b5bea948197159ffff8871f755bd127fb1041c3e7b0942f0148f406a937d1706c4acb677 SHA512 67b56ea325d71a5f27c2004ad2743e35cd14ceddfb72ecc631e172422953f5af04b428ad804f41666d1bd3a2f33c20b32b217fc339af51aaec4c03187dde4e17
+EBUILD bpftool-6.5.7.ebuild 2904 BLAKE2B f5b3e6d184fd825c036dcb8e2dbde9c2d278530d3b6662285a1eaa1a5e0406118f2d2ecd1e327464b6f729308bde5260e5c90ee733ccdc3e06f31e23d5f53e95 SHA512 d5c5da1796fd52b9f7c414574f6d04f49203f05ace439a8409e699429b357afaf52008b7ff639b5ee5ba7088a0e64ef1def27cf175f2e917f799772095d095af
MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild b/dev-util/bpftool/bpftool-6.5.7.ebuild
new file mode 100644
index 000000000000..8d18340895fc
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.5.7.ebuild
@@ -0,0 +1,118 @@
+# 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/clippy/Manifest b/dev-util/clippy/Manifest
index 23aa81740938..a53dd029a1eb 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,7 +1,5 @@
-DIST clippy-8.5.2.tar.gz 10076639 BLAKE2B 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404 SHA512 1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
-DIST clippy-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
+DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
-EBUILD clippy-8.5.2.ebuild 1042 BLAKE2B c27e6af0eeac3f71b2a143a0b9f65fe06e3357a92e8b3ccf2e0c5d54d2f22a0327001b62175e205d54f9777515bd2f5f964660e3f23271890e8f078ef7256922 SHA512 7554bceed36172c152089fd0e12750023d9cfea77fa4a9c093079500be0dac50bc452b8df260670fe10d84eb9ed4874ed46c925954c47af8aabbf673102b59e8
-EBUILD clippy-8.5.ebuild 1178 BLAKE2B b27184aeb6820bcc8ea8f6d0c682dbc10b74b566bf9b2741aa82e85e24afd69dd5b648071f9d7cf7b5f548925e33df4c37ebf4170d727d3fc3b2cd7b7735fbef SHA512 e26991b0a05493d6e6644cd3657547bd5e2509ac68f54fb14f4a43a50cb0cbe675aabde1a57193232660e7f236bec324774a2e737f02e2a0f116e44c0c09f6c8
+EBUILD clippy-9.0.1.ebuild 1164 BLAKE2B 145fad105431411f6c5ad72443c5da8d3db1e891b47871e7d9b6b02e8601e3197aa49fad452cc50cd7ed553aa1356e40e83d71260bc769657d43d0832f68c260 SHA512 171443c72874df1753384f480a824077815154b028161ee63d678040ef3802abcafbddde79bcbaf5da7392f517c834a10fc3cf75ad115bea9b8301493884be9d
EBUILD clippy-9.0.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
MISC metadata.xml 698 BLAKE2B 6d9e26fe97aec43d747a6f32f2798ac54dd90bc2455754681b9af469482cca56b0af5ef9aef37d7a499cbb645ff925c2f2310f505e6abc97f1480ba74490d99a SHA512 c22ce95c9ef7a367c3a9f0fcc937850a8caf73b59b4dfc52f22bdd8163729bb6624f518856da1d3198e29e2a0eeabbfc2e818c8f9b15b1005d133d39bbd0d4f1
diff --git a/dev-util/clippy/clippy-8.5.2.ebuild b/dev-util/clippy/clippy-8.5.2.ebuild
deleted file mode 100644
index c9bb649db28e..000000000000
--- a/dev-util/clippy/clippy-8.5.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# standalone clippy does not have any tests
-# restrict to prevent bug 811753
-RESTRICT="test"
-
-DEPEND="
- ${PYTHON_DEPS}
- virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug #884291
- unset YACC
- export LEX=flex
-
- econf --enable-clippy-only
-}
-
-src_install() {
- # 830087
- find "lib" -type f -name "clippy" -print0 |
- xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
- xargs -I '{}' dobin '{}' ||
- die "Failed to install 'lib/clippy'"
-}
diff --git a/dev-util/clippy/clippy-8.5.ebuild b/dev-util/clippy/clippy-9.0.1.ebuild
index 7ee5e72ee67d..ec1ffe461fd4 100644
--- a/dev-util/clippy/clippy-8.5.ebuild
+++ b/dev-util/clippy/clippy-9.0.1.ebuild
@@ -9,12 +9,12 @@ inherit autotools python-single-r1
DESCRIPTION="Standalone clippy tool built from FRR sources"
HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz"
S="${WORKDIR}/frr-${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# standalone clippy does not have any tests