From d75633612faf228e8be5967fca0d63fc80e49a76 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 24 Apr 2023 07:13:07 +0000 Subject: [PATCH] dev-util/bpftool: Sync with Gentoo It's from Gentoo commit 383aa3a39d95af76597b402fe0d048e4933392ca. --- .../portage-stable/dev-util/bpftool/Manifest | 4 +--- .../dev-util/bpftool/bpftool-6.2.1.ebuild | 2 +- ...{bpftool-5.19.12.ebuild => bpftool-6.2.11.ebuild} | 12 ++++-------- 3 files changed, 6 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/bpftool/{bpftool-5.19.12.ebuild => bpftool-6.2.11.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest index 5ade2d9060..2083bea69d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest @@ -1,5 +1,3 @@ -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 +DIST patch-6.2.11.xz 683356 BLAKE2B e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda SHA512 86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.1.ebuild index 5e04ebcc3c..ac56b1006e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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=" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.11.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.11.ebuild index fa8315db60..5e04ebcc3c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.2.11.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" @@ -20,14 +20,12 @@ 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" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" IUSE="caps" RDEPEND=" @@ -89,10 +87,8 @@ src_prepare() { 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 + # bug #890638 + eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch popd || die # dev-python/docutils installs rst2man.py, not rst2man