From ec2b61fce1c18a12c00a7d9a77ec94f4370a8276 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 25 Nov 2021 11:19:30 +0100 Subject: [PATCH 1/5] sys-kernel/linux-headers: Sync with gentoo It's from gentoo commit 6beda972e3fc6a2a32603652855a83da1b61e4b3. --- .../sys-kernel/linux-headers/Manifest | 2 + ...-Use-stddefs.h-instead-of-compiler.h.patch | 27 ++++++++++ .../linux-headers/linux-headers-4.19.ebuild | 4 +- .../linux-headers-5.10-r1.ebuild | 50 +++++++++++++++++++ .../linux-headers/linux-headers-5.10.ebuild | 2 +- .../linux-headers/linux-headers-5.11.ebuild | 2 +- .../linux-headers/linux-headers-5.12.ebuild | 2 +- .../linux-headers/linux-headers-5.14.ebuild | 2 +- .../linux-headers/linux-headers-5.15.ebuild | 45 +++++++++++++++++ .../linux-headers/linux-headers-5.4-r1.ebuild | 2 +- .../linux-headers/linux-headers-5.9.ebuild | 2 +- 11 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest index 11bc241576..53067ee582 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest @@ -8,6 +8,7 @@ DIST gentoo-headers-5.11-1.tar.xz 3624 BLAKE2B 378eed88876a911e47ea08563f4fea840 DIST gentoo-headers-5.12-1.tar.xz 3624 BLAKE2B 71206e81c9df3c26b93384231094f2e7762cc3b957261a18999b4e3c782ca3edd2ba25461dcb308b938f515495aabbf5d34234f2b9f072fc344a1c8eb1c3a001 SHA512 f15f31116e81114794de8d2ff30e60ff3844a2202837753754b8ee2c2a56dffcfacc6f873d3d67bc313367ad678d00d84410bf6ced0a32cf391e2978d9eaed6a DIST gentoo-headers-5.13-1.tar.xz 2164 BLAKE2B bd2a7454111961c29134087801c5bcf88c9d0ff9d066c87ba8e81b9004c89290ebec46508324f2062e52166c0e4f82a1a740a66e48140030ce8adc7f4b4c9ccd SHA512 9f7fc903c7ad5142322e83a15a356acfbddd0b8f67c998dd03d74c57816eca7eb54f4b8b02c31f92bb9cf63b3285ff98ad9fe09a5fb8f0864a88da2ec80d3da5 DIST gentoo-headers-5.14-1.tar.xz 1496 BLAKE2B f58c7079fdc95a4f0add255b3aca6f39554349369930364d1d67df9a2020213c1dd3f24f00e1992877d69839a28183a2139c26ac52db42b9edfff7a2254ee333 SHA512 1c1052405e2ec7bc0b32ed3036d173ca8f471ea2997f52cd5915a5a0963c86ec263beb63615f14267cb473ec2e5d047fd78960718a6866b64f84b634a0062b07 +DIST gentoo-headers-5.15-1.tar.xz 1496 BLAKE2B 9d88ecc517e226580ba43cba1b5cc62232690ed219f9c5e2d26047de6dbc4056eaaf04c320b2758acb3cb08b44ec402c7185989e0c5ded40c44f7b4bb1d77328 SHA512 f31d5fb4b5264a8b9c060d4215462796240c2423f0872e55ba4e96904086264f55b54d00342aef625a8f710c2ebc2d731bcf79cd0362b398c84235ff949eb229 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be DIST gentoo-headers-5.9-1.tar.xz 4304 BLAKE2B 5dda91dac529cf3afca220d0ec323f679eae00e850e127ca6fb7dd42313afe7d4e2b23860a5b58673c070456e1ebd6b0d48efd681a764eef1bab996de579fd11 SHA512 3522d25e4d13f703e69a7e8da1813b38c8977821363b56af1988d78c446087dea4c3499283a2fdef2dc000fde29b945abb821a01f53ac0ac6c2b551699b3b18c DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 @@ -20,5 +21,6 @@ DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64 +DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch new file mode 100644 index 0000000000..ac8bbe8b55 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch @@ -0,0 +1,27 @@ +Needed for musl. + +From 9eb3c31415686ae1296d7d450f886eeba5861ec1 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Thu, 3 Jun 2021 18:41:28 -0500 +Subject: [PATCH] Use stddefs.h instead of compiler.h + +--- + include/uapi/linux/swab.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h +index 7272f85..3736f2f 100644 +--- a/include/uapi/linux/swab.h ++++ b/include/uapi/linux/swab.h +@@ -3,7 +3,7 @@ + #define _UAPI_LINUX_SWAB_H + + #include +-#include ++#include + #include + #include + +-- +2.31.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.19.ebuild index 054c22728d..5a206d6179 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.19.ebuild @@ -10,9 +10,9 @@ detect_version PATCH_VER="1" SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/gentoo-headers-base-${PV}.tar.xz ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild new file mode 100644 index 0000000000..d305baff01 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa" +inherit kernel-2 toolchain-funcs +detect_version + +PATCH_PV=${PV} # to ease testing new versions against not existing patches +PATCH_VER="1" +SRC_URI="${KERNEL_URI} + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} +" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="" + +S=${WORKDIR}/linux-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PATCH_PV}/*.patch + + if use elibc_musl ; then + # TODO: May need forward porting to newer versions + eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch + fi + + default +} + +src_test() { + emake headers_check ${xmakeopts} +} + +src_install() { + kernel-2_src_install + + find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete + find "${ED}" -depth -type d -delete 2>/dev/null +} diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10.ebuild index 7bb1f871f1..716f218f7d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10.ebuild @@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="1" SRC_URI="${KERNEL_URI} ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.11.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.11.ebuild index 47598e3e96..0368a1aa7b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.11.ebuild @@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="1" SRC_URI="${KERNEL_URI} ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.12.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.12.ebuild index d17f51addf..82fa20bbed 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.12.ebuild @@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="1" SRC_URI="${KERNEL_URI} ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.14.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.14.ebuild index 248b467715..8ac754c008 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.14.ebuild @@ -13,7 +13,7 @@ PATCH_VER="1" PATCH_DEV="sam" SRC_URI=" ${KERNEL_URI} - ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}" + ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}" S="${WORKDIR}/linux-${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15.ebuild new file mode 100644 index 0000000000..8ac754c008 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa" +inherit kernel-2 toolchain-funcs +detect_version + +PATCH_PV=${PV} # to ease testing new versions against not existing patches +PATCH_VER="1" +PATCH_DEV="sam" +SRC_URI=" + ${KERNEL_URI} + ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}" +S="${WORKDIR}/linux-${PV}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + app-arch/xz-utils + dev-lang/perl" + +[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} ) + +src_unpack() { + # avoid kernel-2_src_unpack + default +} + +src_prepare() { + # avoid kernel-2_src_prepare + default +} + +src_test() { + emake headers_check ${xmakeopts} +} + +src_install() { + kernel-2_src_install + + find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild index 1d60107656..0796ff62d4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild @@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="2" SRC_URI="${KERNEL_URI} ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.9.ebuild index 47598e3e96..0368a1aa7b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.9.ebuild @@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="1" SRC_URI="${KERNEL_URI} ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" From 285e82c44abd759ace1bea9b10c1c02c26d40c27 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 25 Nov 2021 11:19:30 +0100 Subject: [PATCH 2/5] dev-util/perf: Sync with gentoo It's from gentoo commit 6ede713804d35a8de4590ac3459a7c8f2c0ee4fd. --- .../portage-stable/dev-util/perf/Manifest | 23 +- .../perf/files/perf-4.1.5-prefix.patch | 43 --- .../perf/files/perf-5.1.15-fix-clang8.patch | 17 -- .../dev-util/perf/files/perf-5.15-clang.patch | 231 +++++++++++++++ .../files/perf-5.4.20-binutil-libs-2.34.patch | 60 ---- .../perf/files/perf-5.4.6-fix-clang9.patch | 17 -- .../files/perf-5.4.7-propagate-cflags.patch | 44 --- .../portage-stable/dev-util/perf/metadata.xml | 82 +++--- .../dev-util/perf/perf-3.12.ebuild | 177 ------------ .../dev-util/perf/perf-3.13.1-r1.ebuild | 182 ------------ .../dev-util/perf/perf-3.15.5.ebuild | 182 ------------ .../dev-util/perf/perf-4.1.5-r1.ebuild | 190 ------------- .../dev-util/perf/perf-4.4.4.ebuild | 184 ------------ .../dev-util/perf/perf-4.9.13.ebuild | 176 ------------ .../dev-util/perf/perf-5.12-r1.ebuild | 267 ++++++++++++++++++ .../dev-util/perf/perf-5.15-r1.ebuild | 266 +++++++++++++++++ .../dev-util/perf/perf-5.8.ebuild | 11 +- 17 files changed, 817 insertions(+), 1335 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-4.1.5-prefix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.1.15-fix-clang8.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.6-fix-clang9.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.12.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.13.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.15.5.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.1.5-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.4.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.9.13.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.12-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest index 1429fb2af9..2b586b7e41 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest @@ -1,22 +1,3 @@ -AUX perf-4.1.5-prefix.patch 1637 SHA256 dac4671e909a0af78345f6253e4c7ca04f0d3d400c76eecaf0149ad51639b241 SHA512 ff7179d7b06513a83f0909723ad47774c07ad089079f43750c24a1dca685745048bce5ea6b0766e65e48b75b50d5a26866e827a89b0206800769ea2779355d6b WHIRLPOOL b9015891fcb48d113b8015a54a7dae290b041ab1cb607c7ea196fc6aeec74c6b14d221c3197efa2ff2040249498082a5fb9588c51428489a1fc9d349b5e799d1 -DIST linux-3.12.tar.bz2 91111381 SHA256 43129defd9079c99cf5e57506d36b6b01614c734a5ed9e604d3a7c1510ab8b22 SHA512 bea14d044c8a0257d8312f45db6a39ca4f9dffe8ac32a11198e90762ee1735c8b6975bb81c635a4755d451793fa7c7e5b2d7d692c9e57133b15b4cdc941febf1 WHIRLPOOL 1889c3f689cf305856112f350e3901175b9f6c4f1e4143d62b40e502000685ade3e75b211a8a9fd948f6225e1c57a68cae10ceb649ff7976981089290d562926 -DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a -DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77 -DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 -DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc -DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a -DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6 -DIST patch-3.15.5.xz 122232 SHA256 9b0d000e0bdec7a25ee6303afdab8d2af77439995876eadd6ce248e5c954037d SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755 WHIRLPOOL 56e1e817c08b4557e18b34d148d8ffd0f73bf8dec92f2339ca9413ca2143b65ec35f6d48c87e37f140226e57d7df33f06d6c53a48dafa7ddf090a839fdabe024 -DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3 -DIST patch-4.4.4.xz 200972 SHA256 9061d8f57cc25d760387c4e6b7d5cceacaa808e8784a3e478012e7c2949853c8 SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc WHIRLPOOL e6a004e32eecca1507354f97d3de85a07c1b9512fe3d4d87173e6d39c02ef1c2411abd0c26b6a077cd5eaefde11dd201445f72b9a0cf185e76635bdcc36df8dd -DIST patch-4.9.13.xz 295932 SHA256 87a0f07dd393e2d08850f0536417d091684535ff0c8ab8f8d9aeab1db38589bf SHA512 d7956cc8a4ab11514789af4f1f7023268e4b003216766c153f0f09aac659aabda5de634b363d53f8daeddfcf5820619c5bca31ff5f9aeb187c1df016c05f68d5 WHIRLPOOL 154747030245f5c1e9f6d9717c32584e3901372fdfe7945497b294c7454f2da4ae4959cf9f1bdd091dca70d346125023a0b5d0c75cc3745342eb8bb56c68e023 -EBUILD perf-3.12.ebuild 5006 SHA256 a549d1bcbeddd0b503fd4bbb4d2f960018e51069333a738086a5cf7999a57403 SHA512 dc69ba512aa1a9f2647dd48f32e5891db94bb3cd8a0294f39e6cf15a76571afeab29956cbb75e76ddc151bb76821ad51c34e7830789bbd8c05a26a5c0de9f9f1 WHIRLPOOL c8ad0306046c2cb433d1229b2f9699956f72db8e9468bb6e4d609ca32608bbf823162ebf6ded248742cb8f06dbc7a2f0c5661b18ba8fbfd238afce9d45ed58c9 -EBUILD perf-3.13.1-r1.ebuild 5128 SHA256 e81a461d221ab947d0850f152de397d8e2e9221dc2934d3f149dba407f4e12de SHA512 19287c4ee43e11aa62748eb3ad40839e8cd27f78710d3f72d5cb10511247a37bcff55c8355a175ea6b155eb873701a080370f29e1d317d0252f929f134c09c26 WHIRLPOOL f78c3f0d591efaeb01ad7eaeb2b813c0f7f2ab46d0b94eaba8691e0e73cbc333a0619a9ba8f38810ddf1937305e446c5359e8a8c6e78d8b568737f44f9c00f2d -EBUILD perf-3.15.5.ebuild 5143 SHA256 d263ee8e8e944a6456a2cdbd7b32e9defcd8fa97c19dec354b0b5ee3d43b952f SHA512 c02b0e36e0cdf192c0a494994e1013d227d73c289471811270fc5877a6256ac52e3aeae0c926c21762adddde51ee61d54acbe5448cd2c13d6b0bffb6ad790038 WHIRLPOOL 3abf1eceb669b4c0e35d7889b885c323a4fad077163e83d475a9cb6588f05ab8990741684847b90a8bbb891a10c7e8ddbac9d0b008905456916f19a6896bec4a -EBUILD perf-4.1.5-r1.ebuild 5269 SHA256 60d3c288baea63e98d8c8f0b5dd9dbdb82cba98fad955d76de3b5abe8ffbeab9 SHA512 c99b7791b0d143519c4e511499420a773b789038a65503f58aabe536f1988cb7d2275008d9dc83e5772119b79b48c1172e76e01c1c7c5ca8d38bb9ddaee7e531 WHIRLPOOL 3cda17ba49e85886a11de6fe099228cfd2a2f9a1f0ccd3a0d3c1f40848f34a2930c228cc546bcce425520716b43e441ee2d95354a2f0e2f0bfd4f32009252876 -EBUILD perf-4.4.4.ebuild 5040 SHA256 abab8bc18347291e53577598ab3f127363e8b90add2641e8c787c17c6d13c02a SHA512 e5d37cfbd4d34f93950c13749a4317f6758b54bbd3c93599fa21eac709ae28b22c07000fbf5ecc69c512eca30b9492a1b71cccca58f48b754a28ecb7d81d24ed WHIRLPOOL 75aa62e82cbf15df3b34f84c728000e6c38452746c7b3918069bb6fc23e73b96c11151cd82fe83e1ef00e255ce9efc4b5e959997a8f37577efa57539783c8a93 -EBUILD perf-4.9.13.ebuild 4780 SHA256 1c4108a23d10577e90236a4a093f768af270bf049e61883962e8bc526f956d37 SHA512 d4c9064643b8688c3deb050bb519223259c80beb3e322239e76cb78f62595a80e90a7529ccd1e6c6cd01be94309f9f271953b26e95bc9a1435f7fea5e4cc6552 WHIRLPOOL a52684efafc6701421ed6b3d33a8d2430a8f1ffa9683137966ff0493dfd748886d6fe68c2ad9b7463cba423e553ec0b52f6cc1c7885c2c8f1ff9d7c3b5fab906 -MISC ChangeLog 3650 SHA256 0975840be7bd7127c7d5b83a130f6ae8621256a7f02eb80196c69298b918eca2 SHA512 742d129e590b0c36adc7cc3b81fa51184c1c147dec3aa5c844a704f81cbab7023f39229c7e06ffcf06f4a5af5d1ba44100b8421f4c52fa5b8f8c47df4016d7ae WHIRLPOOL effae523378dd7bbdfac3dbb990e7e1a0b8d0cb18c08128c138f3e84d8f6419a9c117c4e7ed867d2ebc4e32279ab12f6c99a921d596f36da2cac74c89c55abc3 -MISC ChangeLog-2015 6264 SHA256 740d932dcee9533fa7cb6a2a03eecdc04aeb744b5d456dcb9972f6c228b57e2f SHA512 aebf127fb17bd1fd086d9f0057dfb5f044e789f943dbda5ef2260b5145944c4f8f44d241610209ec9c9a65908aa932019d5f0d3c027dfb5869423daf6762cb08 WHIRLPOOL 0f040aa61460166d988e4becfe91449bab91e90c5ac2d5da04eeb8685142a96700f776625f21b4997d5518857597c851934ebcdf6e558407ee25adce0d5ca63f -MISC metadata.xml 1153 SHA256 880863b904a364fe264b2d6e4db2d5086b543df748a140aeab88bf531db1c88e SHA512 18e5b436d7ae5ba8c9da8bd4007e33006e25f351d9e01e55127bd35f47446663faafa1de37283410e0cec9f00b8b4422afb4a8d256b8161d88c3c084e8c9a09d WHIRLPOOL 2f765f9167d86eb0317b673f91f2c44190dc6d1a231d2fc047cdea57c8c0fcc03083bdfa03fae2abae1263d225141f1b9f6109f91026c77d47f7e532fb907c31 +DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d +DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-4.1.5-prefix.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-4.1.5-prefix.patch deleted file mode 100644 index 0c4dff0113..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-4.1.5-prefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 75e84ab906ef8935cff3df3d8929f1bafea81599 -Author: Lukas Wunner -Date: Thu Jun 18 13:00:32 2015 +0200 - - perf tools: Fix build breakage if prefix= is specified - - Invoking Makefile.perf with prefix= breaks the build since Makefile.perf - hands that variable down to Makefile.build where it overrides - - prefix := $(subst ./,,$(OUTPUT)$(dir)/) - - leading to errors like this: - - No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o' - - Signed-off-by: Lukas Wunner - Acked-by: Jiri Olsa - Cc: David Ahern - Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 - Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com - Signed-off-by: Arnaldo Carvalho de Melo - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index 10df572..98cfc38 100644 ---- a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y)) - subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) - - # '$(OUTPUT)/dir' prefix to all objects --prefix := $(subst ./,,$(OUTPUT)$(dir)/) --obj-y := $(addprefix $(prefix),$(obj-y)) --subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) -+objprefix := $(subst ./,,$(OUTPUT)$(dir)/) -+obj-y := $(addprefix $(objprefix),$(obj-y)) -+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) - - # Final '$(obj)-in.o' object --in-target := $(prefix)$(obj)-in.o -+in-target := $(objprefix)$(obj)-in.o - - PHONY += $(subdir-y) - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.1.15-fix-clang8.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.1.15-fix-clang8.patch deleted file mode 100644 index 743f4b017b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.1.15-fix-clang8.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/678652 -Created-By: Maciej S. Szmigiero ---- ---- a/tools/build/feature/test-clang.cpp 2018-12-24 00:55:59.000000000 +0100 -+++ b/tools/build/feature/test-clang.cpp 2019-04-06 16:05:56.828757243 +0200 -@@ -1,10 +1,10 @@ - // SPDX-License-Identifier: GPL-2.0 --#include "clang/Basic/VirtualFileSystem.h" - #include "clang/Driver/Driver.h" - #include "clang/Frontend/TextDiagnosticPrinter.h" - #include "llvm/ADT/IntrusiveRefCntPtr.h" - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" -+#include "llvm/Support/VirtualFileSystem.h" - - using namespace clang; - using namespace clang::driver; diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch new file mode 100644 index 0000000000..5ea0c75f27 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch @@ -0,0 +1,231 @@ +From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001 +From: Ian Rogers +Date: Mon, 11 Oct 2021 19:13:20 -0700 +Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14 + +LLVM 9 (current release is LLVM 13) moved the minimum C++ version to +GNU++14. Bump the version numbers in the feature test and perf build. + +Reviewed-by: Fangrui Song +Signed-off-by: Ian Rogers +Cc: Alexander Shishkin +Cc: Daniel Borkmann +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Leo Yan +Cc: Mark Rutland +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Peter Zijlstra +Cc: Sedat Dilek +Cc: llvm@lists.linux.dev +Link: https://lore.kernel.org/r/20211012021321.291635-1-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/build/feature/Makefile | 6 +++--- + tools/perf/Makefile.config | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile +index eff55d287db1..9756e589e4ae 100644 +--- a/tools/build/feature/Makefile ++++ b/tools/build/feature/Makefile +@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin: + $(BUILD) + + $(OUTPUT)test-llvm.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + $(shell $(LLVM_CONFIG) --libs Core BPF) \ +@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin: + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-llvm-version.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-clang.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + -Wl,--start-group -lclangBasic -lclangDriver \ +diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config +index 14e3e8d702a0..ddbe86defe39 100644 +--- a/tools/perf/Makefile.config ++++ b/tools/perf/Makefile.config +@@ -285,7 +285,7 @@ CORE_CFLAGS += -Wall + CORE_CFLAGS += -Wextra + CORE_CFLAGS += -std=gnu99 + +-CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti ++CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti + CXXFLAGS += -Wall + CXXFLAGS += -fno-omit-frame-pointer + CXXFLAGS += -ggdb3 +-- +2.33.1 + + +From 3e5c11995e04a9e3351330c34c4c802ce50df46c Mon Sep 17 00:00:00 2001 +From: Ian Rogers +Date: Mon, 11 Oct 2021 19:13:21 -0700 +Subject: [PATCH 2/3] perf clang: Fixes for more recent LLVM/clang + +The parameters to two functions and the location of a variable have +changed in more recent LLVM/clang releases. + +Remove the unneecessary -fmessage-length and -ferror-limit flags, the +former causes failures like: + + 58: builtin clang support : + 58.1: builtin clang compile C source to IR : + --- start --- + test child forked, pid 279307 + error: unknown argument: '-fmessage-length' + 1 error generated. + test child finished with -1 + +Tested with LLVM 6, 8, 9, 10 and 11. + +Reviewed-by: Fangrui Song +Signed-off-by: Ian Rogers +Cc: Alexander Shishkin +Cc: Daniel Borkmann +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Leo Yan +Cc: Mark Rutland +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Peter Zijlstra +Cc: Sedat Dilek , +Cc: llvm@lists.linux.dev +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/util/c++/clang.cpp | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp +index c8885dfa3667..df7b18fb6b6e 100644 +--- a/tools/perf/util/c++/clang.cpp ++++ b/tools/perf/util/c++/clang.cpp +@@ -43,8 +43,6 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path, + "-cc1", + "-triple", "bpf-pc-linux", + "-fsyntax-only", +- "-ferror-limit", "19", +- "-fmessage-length", "127", + "-O2", + "-nostdsysteminc", + "-nobuiltininc", +@@ -55,7 +53,11 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path, + "-x", "c"}; + + CCArgs.append(CFlags.begin(), CFlags.end()); +- CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs); ++ CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs ++#if CLANG_VERSION_MAJOR >= 11 ++ ,/*BinaryName=*/nullptr ++#endif ++ ); + + FrontendOptions& Opts = CI->getFrontendOpts(); + Opts.Inputs.clear(); +@@ -151,13 +153,16 @@ getBPFObjectFromModule(llvm::Module *Module) + + legacy::PassManager PM; + bool NotAdded; +-#if CLANG_VERSION_MAJOR < 7 +- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, +- TargetMachine::CGFT_ObjectFile); ++ NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream ++#if CLANG_VERSION_MAJOR >= 7 ++ , /*DwoOut=*/nullptr ++#endif ++#if CLANG_VERSION_MAJOR < 10 ++ , TargetMachine::CGFT_ObjectFile + #else +- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, nullptr, +- TargetMachine::CGFT_ObjectFile); ++ , llvm::CGFT_ObjectFile + #endif ++ ); + if (NotAdded) { + llvm::errs() << "TargetMachine can't emit a file of this type\n"; + return std::unique_ptr>(nullptr); +-- +2.33.1 + + +From aa2b4e5e920cbaadc0fed9b8aa7c4498feee3dd5 Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio +Date: Thu, 29 Apr 2021 13:44:48 +0200 +Subject: [PATCH 3/3] tools feature: update LLVM/Clang detection + +Since LLVM/Clang 10, individual libraries have been merged into +monolithic libraries libLLVM.so, libclang.so, and libclang-cpp.so. +--- + tools/build/feature/Makefile | 8 +++----- + tools/perf/Makefile.perf | 7 ++----- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile +index 9756e589e4ae..23478bd06093 100644 +--- a/tools/build/feature/Makefile ++++ b/tools/build/feature/Makefile +@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin: + $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ +- $(shell $(LLVM_CONFIG) --libs Core BPF) \ ++ $(shell $(LLVM_CONFIG) --libs) \ + $(shell $(LLVM_CONFIG) --system-libs) \ + > $(@:.bin=.make.output) 2>&1 + +@@ -312,11 +312,9 @@ $(OUTPUT)test-clang.bin: + $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ +- -Wl,--start-group -lclangBasic -lclangDriver \ +- -lclangFrontend -lclangEdit -lclangLex \ +- -lclangAST -Wl,--end-group \ +- $(shell $(LLVM_CONFIG) --libs Core option) \ ++ $(shell $(LLVM_CONFIG) --libs) \ + $(shell $(LLVM_CONFIG) --system-libs) \ ++ -lclang-cpp \ + > $(@:.bin=.make.output) 2>&1 + + -include $(OUTPUT)*.d +diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf +index b856afa6eb52..d0ff0ddf9c18 100644 +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -410,14 +410,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) + LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group + + ifeq ($(USE_CLANG), 1) +- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization +- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l)) +- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so)) +- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group ++ LIBS += -lclang-cpp + endif + + ifeq ($(USE_LLVM), 1) +- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs) ++ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs) + LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) + endif + +-- +2.33.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch deleted file mode 100644 index 9fa191f720..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_ since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Signed-off-by: Changbin Du -Acked-by: Jiri Olsa -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6..5b7d6c1 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; --- -cgit v1.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.6-fix-clang9.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.6-fix-clang9.patch deleted file mode 100644 index 614e62f676..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.6-fix-clang9.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/695726 -Created-By: Maciej S. Szmigiero -Created-By: Dennis Schridde ---- a/tools/perf/util/c++/clang.cpp.orig 2019-12-20 16:39:21.015363866 +0100 -+++ b/tools/perf/util/c++/clang.cpp 2019-12-20 16:40:04.051639185 +0100 -@@ -71,7 +71,11 @@ - CompilerInstance Clang; - Clang.createDiagnostics(); - -+#if CLANG_VERSION_MAJOR < 9 - Clang.setVirtualFileSystem(&*VFS); -+#else -+ Clang.createFileManager(&*VFS); -+#endif - - #if CLANG_VERSION_MAJOR < 4 - IntrusiveRefCntPtr CI = diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch deleted file mode 100644 index b1a9bcc25a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 55542113c690a567e728e40d4181d7d037fc21b0 Mon Sep 17 00:00:00 2001 -From: Jiri Olsa -Date: Fri, 11 Oct 2019 14:21:55 +0200 -Subject: perf tools: Propagate CFLAGS to libperf - -Andi reported that 'make DEBUG=1' does not propagate to the libbperf -code. It's true also for the other flags. Changing the code to propagate -the global build flags to libperf compilation. - -Reported-by: Andi Kleen -Signed-off-by: Jiri Olsa -Cc: Alexander Shishkin -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/20191011122155.15738-1-jolsa@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/lib/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -(limited to 'tools/perf/lib/core.c') - -diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c -index d0b9ae422b9f..58fc894b76c5 100644 ---- a/tools/perf/lib/core.c -+++ b/tools/perf/lib/core.c -@@ -5,11 +5,12 @@ - #include - #include - #include -+#include - #include - #include - #include "internal.h" - --static int __base_pr(enum libperf_print_level level, const char *format, -+static int __base_pr(enum libperf_print_level level __maybe_unused, const char *format, - va_list args) - { - return vfprintf(stderr, format, args); --- -cgit 1.2-0.3.lf.el7 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml index 6755b76325..3d3ce6d908 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml @@ -1,41 +1,47 @@ - + - - naota@gentoo.org - - - dlan@gentoo.org - Yixun Lan - - - amadio@gentoo.org - Guilherme Amadio - - - Enable builtin clang and LLVM support - - Enable C++ symbol name demangling, using libbfd from - sys-devel/binutils. When this flag is enabled, the - package will have to be rebuilt after every version bump of - binutils. - - - Build documentation and man pages. With this USE flag disabled, - the --help parameter for perf and its sub-tools will not be - available. This is optional because it depends on a few - documentation handling tools that are not always welcome on user - systems. - - Enable NUMA support - - Add support for Perl as a scripting language for perf tools. - - - Add support to define SDT event in perf tools. - - - Use sys-libs/libunwind for frame unwinding support. - - + + naota@gentoo.org + + + dlan@gentoo.org + Yixun Lan + + + amadio@gentoo.org + Guilherme Amadio + + + zlogene@gentoo.org + Mikle Kolyada + + + Enable dev-util/babeltrace support + Enable builtin clang and LLVM support + + Enable C++ symbol name demangling, using libbfd from + sys-devel/binutils. When this flag is enabled, the + package will have to be rebuilt after every version bump of + binutils. + + + Build documentation and man pages. With this USE flag disabled, + the --help parameter for perf and its sub-tools will not be + available. This is optional because it depends on a few + documentation handling tools that are not always welcome on user + systems. + + Enable dev-libs/libpfm support + Enable NUMA support + + Add support for Perl as a scripting language for perf tools. + + + Add support to define SDT event in perf tools. + + + Use sys-libs/libunwind for frame unwinding support. + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.12.ebuild deleted file mode 100644 index aca34af0c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.12.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV/_rc} != ${PV} ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.bz2 - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [[ $(get_version_component_count) == 4 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV}.bz2 - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" -else - LINUX_VER=${PV} - SRC_URI="" -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="audit +demangle +doc perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e 's:-Werror::' \ - -e 's:-ggdb3::' \ - -e 's:-fstack-protector-all::' \ - -e 's:^LDFLAGS =:EXTLIBS +=:' \ - -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \ - -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \ - -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \ - -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \ - -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \ - "${S}"/Makefile || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die - sed -i \ - -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \ - "${S}"/Makefile \ - "${S}"/Documentation/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(KV=2.6.23 tc-arch-kernel) - emake -j1 V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" \ - prefix="/usr" bindir_relative="sbin" \ - CFLAGS_OPTIMIZE="${CFLAGS}" \ - LDFLAGS_OPTIMIZE="${LDFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.13.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.13.1-r1.ebuild deleted file mode 100644 index 611fe2c9a0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.13.1-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -else - VER_COUNT=$(get_version_component_count) - if [[ ${VER_COUNT} -gt 2 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - else - LINUX_VER=${PV} - SRC_URI="" - fi -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -IUSE="audit +demangle +doc gtk perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils ) - gtk? ( x11-libs/gtk+:2 ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e 's:-Werror::' \ - -e 's:-ggdb3::' \ - -e 's:-fstack-protector-all::' \ - -e 's:^LDFLAGS =:EXTLIBS +=:' \ - -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \ - -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \ - -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \ - -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \ - -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \ - "${S}"/Makefile || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die - sed -i \ - -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \ - "${S}"/Makefile \ - "${S}"/Documentation/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(KV=2.6.23 tc-arch-kernel) - emake V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" \ - prefix="/usr" bindir_relative="bin" \ - CFLAGS_OPTIMIZE="${CFLAGS}" \ - LDFLAGS_OPTIMIZE="${LDFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make -f Makefile.perf - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make -f Makefile.perf install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.15.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.15.5.ebuild deleted file mode 100644 index 5d12d19784..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-3.15.5.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -else - VER_COUNT=$(get_version_component_count) - if [[ ${VER_COUNT} -gt 2 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - else - LINUX_VER=${PV} - SRC_URI="" - fi -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="audit debug +demangle +doc gtk perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils ) - gtk? ( x11-libs/gtk+:2 ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( tools/perf tools/scripts tools/include tools/lib include lib "arch/*/include" "arch/*/lib" ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e 's:-Werror::' \ - -e 's:-ggdb3::' \ - -e 's:-fstack-protector-all::' \ - -e 's:^LDFLAGS =:EXTLIBS +=:' \ - -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \ - -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \ - -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \ - -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \ - -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \ - "${S}"/Makefile || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die - sed -i \ - -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \ - "${S}"/Makefile \ - "${S}"/Documentation/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(KV=2.6.23 tc-arch-kernel) - emake V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" \ - prefix="/usr" bindir_relative="bin" \ - CFLAGS_OPTIMIZE="${CFLAGS}" \ - LDFLAGS_OPTIMIZE="${LDFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make -f Makefile.perf - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make -f Makefile.perf install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.1.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.1.5-r1.ebuild deleted file mode 100644 index eae2c68bad..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.1.5-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -else - VER_COUNT=$(get_version_component_count) - if [[ ${VER_COUNT} -gt 2 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - else - LINUX_VER=${PV} - SRC_URI="" - fi -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86" -IUSE="audit debug +demangle +doc gtk numa perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils:= ) - gtk? ( x11-libs/gtk+:2 ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( - tools/build tools/include tools/lib tools/perf tools/scripts - include lib "arch/*/include" "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - epatch "${FILESDIR}"/${P}-prefix.patch - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e 's:-Werror::' \ - -e 's:-ggdb3::' \ - -e 's:-fstack-protector-all::' \ - -e 's:^LDFLAGS =:EXTLIBS +=:' \ - -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \ - -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \ - -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \ - -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \ - -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \ - "${S}"/Makefile || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die - sed -i \ - -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \ - "${S}"/Makefile \ - "${S}"/Documentation/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(tc-arch-kernel) - emake V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" \ - prefix="/usr" bindir_relative="bin" \ - CFLAGS_OPTIMIZE="${CFLAGS}" \ - LDFLAGS_OPTIMIZE="${LDFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - NO_LIBNUMA=$(puse numa) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make -f Makefile.perf - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make -f Makefile.perf install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.4.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.4.4.ebuild deleted file mode 100644 index 5e0ea1294a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.4.4.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -else - VER_COUNT=$(get_version_component_count) - if [[ ${VER_COUNT} -gt 2 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - else - LINUX_VER=${PV} - SRC_URI="" - fi -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="audit debug +demangle +doc gtk numa perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils:= ) - gtk? ( x11-libs/gtk+:2 ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4.4 - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e 's:-Werror::' \ - -e 's:-ggdb3::' \ - -e 's:-fstack-protector-all::' \ - -e 's:^LDFLAGS =:EXTLIBS +=:' \ - -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \ - -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \ - "${S}"/config/Makefile || die - sed -i \ - -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \ - "${S}"/Makefile.perf || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(tc-arch-kernel) - emake V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \ - prefix="/usr" bindir_relative="bin" \ - EXTRA_CFLAGS="${CFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - NO_LIBNUMA=$(puse numa) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make -f Makefile.perf - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make -f Makefile.perf install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.9.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.9.13.ebuild deleted file mode 100644 index f5543c72d2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-4.9.13.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) - PATCH_VERSION=$(get_version_component_range 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -else - VER_COUNT=$(get_version_component_count) - if [[ ${VER_COUNT} -gt 2 ]] ; then - # stable-release series - LINUX_VER=$(get_version_component_range 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - else - LINUX_VER=${PV} - SRC_URI="" - fi -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="audit debug +demangle +doc gtk numa perl python slang unwind" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="audit? ( sys-process/audit ) - demangle? ( sys-devel/binutils ) - gtk? ( x11-libs/gtk+:2 ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl ) - slang? ( dev-libs/newt ) - unwind? ( sys-libs/libunwind ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4.4 - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - python? ( ${PYTHON_DEPS} )" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 || die - 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() { - if [[ -n ${LINUX_PATCH} ]] ; then - cd "${S_K}" - epatch "${WORKDIR}"/${P}.patch - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \ - "${S}"/Makefile.perf || die - sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die - - # Avoid the call to make kernelversion - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - local arch=$(tc-arch-kernel) - emake V=1 \ - CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \ - prefix="/usr" bindir_relative="bin" \ - EXTRA_CFLAGS="${CFLAGS}" \ - ARCH="${arch}" \ - NO_DEMANGLE=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_NEWT=$(puse slang) \ - NO_LIBNUMA=$(puse numa) \ - WERROR=0 \ - "$@" -} - -src_compile() { - perf_make -f Makefile.perf - use doc && perf_make -C Documentation -} - -src_test() { - : -} - -src_install() { - perf_make -f Makefile.perf install DESTDIR="${D}" - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - if use doc ; then - dohtml Documentation/*.html - doman Documentation/*.1 - fi -} - -pkg_postinst() { - if ! use doc ; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.12-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.12-r1.ebuild new file mode 100644 index 0000000000..3d3079203e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.12-r1.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="https://perf.wiki.kernel.org/" + +LINUX_V="${PV:0:1}.x" +if [[ ${PV} == *_rc* ]] ; then + LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) + PATCH_VERSION=$(ver_cut 1-3) + LINUX_PATCH=patch-${PV//_/-}.xz + SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} + https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" +elif [[ ${PV} == *.*.* ]] ; then + # stable-release series + 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}" +else + LINUX_VER=${PV} + SRC_URI="" +fi + +LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" +SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + ${LINUX_PATCH+dev-util/patchutils} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-text/asciidoc + app-text/sgml-common + app-text/xmlto + sys-process/time + ) + ${PYTHON_DEPS} +" + +RDEPEND="audit? ( sys-process/audit ) + babeltrace? ( dev-util/babeltrace ) + crypt? ( virtual/libcrypt:= ) + clang? ( + =sys-kernel/linux-headers-5.10 + java? ( virtual/jdk ) +" + +S_K="${WORKDIR}/linux-${LINUX_VER}" +S="${S_K}/tools/perf" + +CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" + +QA_FLAGS_IGNORED=( + usr/bin/perf-read-vdso32 # not linked with anything except for libc + usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed +) + +pkg_pretend() { + if ! use doc ; then + ewarn "Without the doc USE flag you won't get any documentation nor man pages." + ewarn "And without man pages, you won't get any --help output for perf and its" + ewarn "sub-tools." + fi +} + +pkg_setup() { + use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup + # We enable python unconditionally as libbpf always generates + # API headers using python script + python_setup +} + +# src_unpack and src_prepare are copied to dev-util/bpftool since +# it's building from the same tarball, please keep it in sync with bpftool +src_unpack() { + local paths=( + tools/arch tools/build tools/include tools/lib tools/perf tools/scripts + scripts include lib "arch/*/lib" + ) + + # We expect the tar implementation to support the -j option (both + # GNU tar and libarchive's tar support that). + echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" + tar --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 + + # Drop some upstream too-developer-oriented flags and fix the + # Makefile in general + sed -i \ + -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \ + "${S}"/Makefile.perf || die + # A few places still use -Werror w/out $(WERROR) protection. + sed -i -e 's:-Werror::' \ + "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die + + # Avoid the call to make kernelversion + sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die + echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE + + # The code likes to compile local assembly files which lack ELF markings. + find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + + + # Fix shebang to use python from prefix + if [[ -n "${EPREFIX}" ]]; then + hprefixify ${S_K}/scripts/bpf_helpers_doc.py + fi +} + +puse() { usex $1 "" no; } +perf_make() { + # The arch parsing is a bit funky. The perf tools package is integrated + # into the kernel, so it wants an ARCH that looks like the kernel arch, + # but it also wants to know about the split value -- i386/x86_64 vs just + # x86. We can get that by telling the func to use an older linux version. + # It's kind of a hack, but not that bad ... + + # LIBDIR sets a search path of perf-gtk.so. Bug 515954 + + local arch=$(tc-arch-kernel) + local java_dir + use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" + # FIXME: NO_CORESIGHT + emake V=1 VF=1 \ + HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + prefix="${EPREFIX}/usr" bindir_relative="bin" \ + tipdir="share/doc/${PF}" \ + EXTRA_CFLAGS="${CFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + ARCH="${arch}" \ + JDIR="${java_dir}" \ + LIBCLANGLLVM=$(usex clang 1 "") \ + LIBPFM4=$(usex libpfm 1 "") \ + NO_AUXTRACE="" \ + NO_BACKTRACE="" \ + NO_CORESIGHT=1 \ + NO_DEMANGLE= \ + GTK2=$(usex gtk 1 "") \ + feature-gtk2-infobar=$(usex gtk 1 "") \ + NO_JVMTI=$(puse java) \ + NO_LIBAUDIT=$(puse audit) \ + NO_LIBBABELTRACE=$(puse babeltrace) \ + NO_LIBBIONIC=1 \ + NO_LIBBPF= \ + NO_LIBCRYPTO=$(puse crypt) \ + NO_LIBDW_DWARF_UNWIND= \ + NO_LIBELF= \ + NO_LIBNUMA=$(puse numa) \ + NO_LIBPERL=$(puse perl) \ + NO_LIBPYTHON=$(puse python) \ + NO_LIBUNWIND=$(puse unwind) \ + NO_LIBZSTD=$(puse zstd) \ + NO_SDT=$(puse systemtap) \ + NO_SLANG=$(puse slang) \ + NO_LZMA=$(puse lzma) \ + NO_ZLIB=$(puse zlib) \ + WERROR=0 \ + LIBDIR="/usr/libexec/perf-core" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ + "$@" +} + +src_compile() { + # test-clang.bin not build with g++ + if use clang; then + pushd "${S_K}/tools/build/feature/" || die + make V=1 CXX=${CHOST}-clang++ test-clang.bin || die + popd + fi + perf_make -f Makefile.perf + use doc && perf_make -C Documentation man +} + +src_test() { + : +} + +src_install() { + _install_python_ext() { + perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" + } + + perf_make -f Makefile.perf install DESTDIR="${D}" + + if use python; then + python_foreach_impl _install_python_ext + fi + + if use gtk; then + local libdir + libdir="$(get_libdir)" + # on some arches it ends up in lib even on 64bit, ppc64 for instance. + [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" + mv "${ED}"/usr/${libdir}/libperf-gtk.so \ + "${ED}"/usr/libexec/perf-core || die + fi + + dodoc CREDITS + + dodoc *txt Documentation/*.txt + + # perf needs this decompressed to print out tips for users + docompress -x /usr/share/doc/${PF}/tips.txt + + if use doc ; then + doman Documentation/*.1 + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild new file mode 100644 index 0000000000..d676dd9534 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="https://perf.wiki.kernel.org/" + +LINUX_V="${PV:0:1}.x" +if [[ ${PV} == *_rc* ]] ; then + LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) + PATCH_VERSION=$(ver_cut 1-3) + LINUX_PATCH=patch-${PV//_/-}.xz + SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} + https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" +elif [[ ${PV} == *.*.* ]] ; then + # stable-release series + 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}" +else + LINUX_VER=${PV} + SRC_URI="" +fi + +LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" +SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + ${LINUX_PATCH+dev-util/patchutils} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-text/asciidoc + app-text/sgml-common + app-text/xmlto + sys-process/time + ) + ${PYTHON_DEPS} +" + +RDEPEND="audit? ( sys-process/audit ) + babeltrace? ( dev-util/babeltrace ) + crypt? ( virtual/libcrypt:= ) + clang? ( + sys-devel/clang:= + sys-devel/llvm:= + ) + gtk? ( x11-libs/gtk+:2 ) + java? ( virtual/jre:* ) + libpfm? ( dev-libs/libpfm ) + lzma? ( app-arch/xz-utils ) + numa? ( sys-process/numactl ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + slang? ( sys-libs/slang ) + systemtap? ( dev-util/systemtap ) + unwind? ( sys-libs/libunwind ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd ) + dev-libs/elfutils + sys-libs/binutils-libs:=" + +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + java? ( virtual/jdk ) +" + +S_K="${WORKDIR}/linux-${LINUX_VER}" +S="${S_K}/tools/perf" + +CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" + +QA_FLAGS_IGNORED=( + usr/bin/perf-read-vdso32 # not linked with anything except for libc + usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed +) + +pkg_pretend() { + if ! use doc ; then + ewarn "Without the doc USE flag you won't get any documentation nor man pages." + ewarn "And without man pages, you won't get any --help output for perf and its" + ewarn "sub-tools." + fi +} + +pkg_setup() { + use clang && llvm_pkg_setup + # We enable python unconditionally as libbpf always generates + # API headers using python script + python_setup +} + +# src_unpack and src_prepare are copied to dev-util/bpftool since +# it's building from the same tarball, please keep it in sync with bpftool +src_unpack() { + local paths=( + tools/arch tools/build tools/include tools/lib tools/perf tools/scripts + scripts include lib "arch/*/lib" + ) + + # We expect the tar implementation to support the -j option (both + # GNU tar and libarchive's tar support that). + echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" + tar --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 + + if use clang; then + pushd "${S_K}" >/dev/null || die + eapply "${FILESDIR}"/${P}-clang.patch + popd || die + fi + + # Drop some upstream too-developer-oriented flags and fix the + # Makefile in general + sed -i \ + -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \ + "${S}"/Makefile.perf || die + # A few places still use -Werror w/out $(WERROR) protection. + sed -i -e 's:-Werror::' \ + "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die + + # Avoid the call to make kernelversion + sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die + echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE + + # The code likes to compile local assembly files which lack ELF markings. + find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + +} + +puse() { usex $1 "" no; } +perf_make() { + # The arch parsing is a bit funky. The perf tools package is integrated + # into the kernel, so it wants an ARCH that looks like the kernel arch, + # but it also wants to know about the split value -- i386/x86_64 vs just + # x86. We can get that by telling the func to use an older linux version. + # It's kind of a hack, but not that bad ... + + # LIBDIR sets a search path of perf-gtk.so. Bug 515954 + + local arch=$(tc-arch-kernel) + local java_dir + use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" + # FIXME: NO_CORESIGHT + emake V=1 VF=1 \ + HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + prefix="${EPREFIX}/usr" bindir_relative="bin" \ + tipdir="share/doc/${PF}" \ + EXTRA_CFLAGS="${CFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + ARCH="${arch}" \ + JDIR="${java_dir}" \ + LIBCLANGLLVM=$(usex clang 1 "") \ + LIBPFM4=$(usex libpfm 1 "") \ + NO_AUXTRACE="" \ + NO_BACKTRACE="" \ + NO_CORESIGHT=1 \ + NO_DEMANGLE= \ + GTK2=$(usex gtk 1 "") \ + feature-gtk2-infobar=$(usex gtk 1 "") \ + NO_JVMTI=$(puse java) \ + NO_LIBAUDIT=$(puse audit) \ + NO_LIBBABELTRACE=$(puse babeltrace) \ + NO_LIBBIONIC=1 \ + NO_LIBBPF= \ + NO_LIBCRYPTO=$(puse crypt) \ + NO_LIBDW_DWARF_UNWIND= \ + NO_LIBELF= \ + NO_LIBNUMA=$(puse numa) \ + NO_LIBPERL=$(puse perl) \ + NO_LIBPYTHON=$(puse python) \ + NO_LIBUNWIND=$(puse unwind) \ + NO_LIBZSTD=$(puse zstd) \ + NO_SDT=$(puse systemtap) \ + NO_SLANG=$(puse slang) \ + NO_LZMA=$(puse lzma) \ + NO_ZLIB=$(puse zlib) \ + WERROR=0 \ + LIBDIR="/usr/libexec/perf-core" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ + "$@" +} + +src_compile() { + # test-clang.bin not build with g++ + if use clang; then + make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die + fi + perf_make -f Makefile.perf + use doc && perf_make -C Documentation man +} + +src_test() { + : +} + +src_install() { + _install_python_ext() { + perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" + } + + perf_make -f Makefile.perf install DESTDIR="${D}" + + if use python; then + python_foreach_impl _install_python_ext + fi + + if use gtk; then + local libdir + libdir="$(get_libdir)" + # on some arches it ends up in lib even on 64bit, ppc64 for instance. + [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" + mv "${ED}"/usr/${libdir}/libperf-gtk.so \ + "${ED}"/usr/libexec/perf-core || die + fi + + dodoc CREDITS + + dodoc *txt Documentation/*.txt + + # perf needs this decompressed to print out tips for users + docompress -x /usr/share/doc/${PF}/tips.txt + + if use doc ; then + doman Documentation/*.1 + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild index ef18f14722..38ceee391a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info +PYTHON_COMPAT=( python3_{7,8} ) +inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -34,7 +34,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86 amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib" # TODO babeltrace REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -62,6 +62,7 @@ DEPEND="${RDEPEND} ${LINUX_PATCH+dev-util/patchutils} sys-devel/bison sys-devel/flex + virtual/pkgconfig java? ( virtual/jdk ) doc? ( app-text/asciidoc @@ -184,6 +185,8 @@ perf_make() { NO_ZLIB= \ WERROR=0 \ LIBDIR="/usr/libexec/perf-core" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ "$@" } From 0e7b9ab914e3d453e573d3546b4c21db5d4daf10 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 25 Nov 2021 11:46:47 +0100 Subject: [PATCH 3/5] dev-util/perf: Support python 3.6 --- .../portage-stable/dev-util/perf/perf-5.15-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild index d676dd9534..601dc13c9a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +# Flatcar: Support python 3.6. +PYTHON_COMPAT=( python3_{6..10} ) inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info DESCRIPTION="Userland tools for Linux Performance Counters" From e66a96c5a4cec04356a4a385f663ee4e60232107 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 25 Nov 2021 11:19:30 +0100 Subject: [PATCH 4/5] sys-apps/iproute2: Sync with gentoo It's from gentoo commit 9bed110cfca15256b3850d2318527a6590e64253. --- .../portage-stable/sys-apps/iproute2/Manifest | 14 +- ...ute2-4.12.0-uclibc-ng-add-ipproto_mh.patch | 38 ----- .../files/iproute2-4.2.0-no-ipv6.patch | 37 ----- ...v6.patch => iproute2-4.20.0-no-ipv6.patch} | 31 ++-- .../files/iproute2-4.5.0-no-iptables.patch | 42 ----- .../files/iproute2-5.1.0-portability.patch | 32 ---- ...> iproute2-5.12.0-configure-nomagic.patch} | 107 +++++++++---- .../sys-apps/iproute2/iproute2-4.10.0.ebuild | 138 ---------------- .../sys-apps/iproute2/iproute2-4.13.0.ebuild | 150 ------------------ .../sys-apps/iproute2/iproute2-4.4.0.ebuild | 128 --------------- .../sys-apps/iproute2/iproute2-4.5.0.ebuild | 128 --------------- .../sys-apps/iproute2/iproute2-4.6.0.ebuild | 138 ---------------- .../sys-apps/iproute2/iproute2-4.7.0.ebuild | 138 ---------------- .../sys-apps/iproute2/iproute2-4.8.0.ebuild | 138 ---------------- .../sys-apps/iproute2/iproute2-4.9.0.ebuild | 138 ---------------- ...5.8.0.ebuild => iproute2-5.13.0-r1.ebuild} | 35 ++-- ...2-4.12.0.ebuild => iproute2-5.14.0.ebuild} | 103 +++++++----- ...2-4.11.0.ebuild => iproute2-5.15.0.ebuild} | 109 ++++++++----- .../sys-apps/iproute2/iproute2-9999.ebuild | 130 +++++++++------ .../sys-apps/iproute2/metadata.xml | 10 +- 20 files changed, 344 insertions(+), 1440 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch rename sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/{iproute2-4.11.0-no-ipv6.patch => iproute2-4.20.0-no-ipv6.patch} (65%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch rename sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/{iproute2-4.20.0-configure-nomagic.patch => iproute2-5.12.0-configure-nomagic.patch} (68%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.10.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.13.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.4.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.5.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.6.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.7.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.8.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.9.0.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/iproute2/{iproute2-5.8.0.ebuild => iproute2-5.13.0-r1.ebuild} (83%) rename sdk_container/src/third_party/portage-stable/sys-apps/iproute2/{iproute2-4.12.0.ebuild => iproute2-5.14.0.ebuild} (58%) rename sdk_container/src/third_party/portage-stable/sys-apps/iproute2/{iproute2-4.11.0.ebuild => iproute2-5.15.0.ebuild} (56%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/Manifest index 96dfc6a9c7..12ee5aa99f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/Manifest @@ -1,11 +1,3 @@ -DIST iproute2-4.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b WHIRLPOOL 7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859 -DIST iproute2-4.11.0.tar.xz 657100 SHA256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512 e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa WHIRLPOOL 9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581 -DIST iproute2-4.12.0.tar.xz 662424 SHA256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512 275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0 WHIRLPOOL 590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2 -DIST iproute2-4.13.0.tar.xz 670340 SHA256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a WHIRLPOOL 757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644 -DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013 -DIST iproute2-4.5.0.tar.xz 554500 SHA256 3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a SHA512 d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860 WHIRLPOOL dc660bde36fed126b27fb69a59c02405b5299b92a6b519ebdce74d817f88be82114bb10217ca34bbc26a89e664ff243e606a84bcb00db41088bce824542def40 -DIST iproute2-4.6.0.tar.xz 570960 SHA256 74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 SHA512 1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f WHIRLPOOL 1b0ff7988d6d5567137aca9d41e2cc3183f3620f8b874113ff9e6ca9508349550e388e423c54b165e73ed54ccb7a366ef8d032a930f27722eccbd5ff6879032e -DIST iproute2-4.7.0.tar.xz 589928 SHA256 8f60dbcfb33a79daae0638f53bdcaa4310c0aa59ae39af8a234020dc69bb7b92 SHA512 dd884b192ede7f165d565dce6819fb7280eda880d4d53e06a604ab20e7ce343ba37847750172fd52061892e9db3d18bd8ae13d37bd4410e50a8f704cb3fe4ece WHIRLPOOL 191335f76f816ec1c86b2b9cac398129a475993e5a6366d0d0a35287eb07ae61d873e1a8a25a0083b28953011d8dfd492e7a718bacfd7f872130cdb2e3a5729d -DIST iproute2-4.8.0.tar.xz 594636 SHA256 a30959c8421bc8ef42719bed41d14e1d7cfdbad80d7d70c5c42ad31f2c2cb389 SHA512 9b9db053e5d6ae2e7dd17870a3081ef61788a7eeb07473430e1a26c3c948123d33840bd6bb81b4a553ac6913ea89f02ac2a1b7d52ced65523a43991f03e84f49 WHIRLPOOL 83015c0bcfc6739ce688307a6824047910d453265883d4fbb9bec67c8720a5f478d2d72e5095ffc75191e64f3525a25f019032f20fc428b622e4a5c1b8fcbe3d -DIST iproute2-4.9.0.tar.xz 613032 SHA256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 SHA512 0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889 WHIRLPOOL 83c8d42ef43f42a58835ff3b1df7460c67db4de1ae9d5df775d8aa15bfe2c488a626dd40c4327c2772436ed88bea1a1f57a953cd6bf650955465e76aec9476a2 -DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 +DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d +DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c +DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch deleted file mode 100644 index 48cae70143..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 18 Jul 2017 14:09:06 +0300 -Subject: [PATCH] Fix build with uClibc-ng - -Add a local definition for IPPROTO_MH to fix build with uClibc-ng. As of -version 1.0.25, the uClibc-ng netinet/in.h header does not provide this -definition. The kernel provided definition is masked by libc-compat.h. Add -this local fix until uClibc-ng syncs netinet/in.h with glibc. - -This partially reverts upstream commit a9ae195a2169 (xfrm: get #define's from -linux includes) - -Signed-off-by: Baruch Siach ---- -Upstream status: non upstreamable; local uClibc-ng compatibility fix ---- - ip/xfrm.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ip/xfrm.h b/ip/xfrm.h -index 54d80ce5e949..50b85550fb45 100644 ---- a/ip/xfrm.h -+++ b/ip/xfrm.h -@@ -30,6 +30,10 @@ - #include - #include - -+#ifndef IPPROTO_MH -+# define IPPROTO_MH 135 -+#endif -+ - #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info)))) - #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info)) - --- -2.13.2 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch deleted file mode 100644 index b29e1aa3e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- iproute2-4.2.0/ip/ipmonitor.c -+++ iproute2-4.2.0/ip/ipmonitor.c -@@ -115,7 +115,6 @@ - } - if (n->nlmsg_type == RTM_NEWPREFIX) { - print_headers(fp, "[PREFIX]", ctrl); -- print_prefix(who, n, arg); - return 0; - } - if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { ---- iproute2-4.2.0/ip/iptunnel.c -+++ iproute2-4.2.0/ip/iptunnel.c -@@ -637,13 +637,6 @@ - break; - case AF_INET: - break; -- /* -- * This is silly enough but we have no easy way to make it -- * protocol-independent because of unarranged structure between -- * IPv4 and IPv6. -- */ -- case AF_INET6: -- return do_ip6tunnel(argc, argv); - default: - fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); - exit(-1); ---- iproute2-4.2.0/ip/Makefile -+++ iproute2-4.2.0/ip/Makefile -@@ -1,6 +1,6 @@ - IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ -- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ -+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ - ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ - iplink_vlan.o link_veth.o link_gre.o iplink_can.o \ - iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \ diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch similarity index 65% rename from sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch rename to sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch index fc855dcf22..31733e99f7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch @@ -1,16 +1,16 @@ ---- iproute2-4.11.0/ip/ipmonitor.c -+++ iproute2-4.11.0/ip/ipmonitor.c -@@ -114,7 +114,6 @@ - } - if (n->nlmsg_type == RTM_NEWPREFIX) { +--- iproute2-4.20.0/ip/ipmonitor.c ++++ iproute2-4.20.0/ip/ipmonitor.c +@@ -118,7 +118,6 @@ + + case RTM_NEWPREFIX: print_headers(fp, "[PREFIX]", ctrl); -- print_prefix(who, n, arg); +- print_prefix(n, arg); return 0; - } - if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { ---- iproute2-4.11.0/ip/iptunnel.c -+++ iproute2-4.11.0/ip/iptunnel.c -@@ -589,13 +589,6 @@ + + case RTM_NEWRULE: +--- iproute2-4.20.0/ip/iptunnel.c ++++ iproute2-4.20.0/ip/iptunnel.c +@@ -549,13 +549,6 @@ break; case AF_INET: break; @@ -24,14 +24,15 @@ default: fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); exit(-1); ---- iproute2-4.11.0/ip/Makefile -+++ iproute2-4.11.0/ip/Makefile -@@ -1,6 +1,6 @@ +--- iproute2-4.20.0/ip/Makefile ++++ iproute2-4.20.0/ip/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ - rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ - ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ + rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ + ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \ - iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \ + iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \ iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \ diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch deleted file mode 100644 index 7ed9dfbad2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- iproute2-4.5.0/configure~ 2016-03-14 23:02:31.000000000 +0000 -+++ iproute2-4.5.0/configure 2016-03-17 13:24:17.634743197 +0000 -@@ -169,10 +169,25 @@ - - check_ipt() - { -- if ! grep TC_CONFIG_XT Config > /dev/null -+ if grep -q TC_CONFIG_XT Config - then -+ return -+ fi -+ -+ cat >$TMPDIR/ipttest.c < -+int main() { return 0; } -+EOF -+ -+ if $CC -std=c90 -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \ -+ $(${PKG_CONFIG} libiptc --cflags --libs 2>/dev/null) -ldl >/dev/null 2>&1 -+ then -+ echo "TC_CONFIG_IPT:=y" >>Config - echo "using iptables" -+ else -+ echo "no" - fi -+ rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest - } - - check_ipt_lib_dir() ---- iproute2-4.5.0/tc/Makefile~ 2016-03-14 23:02:31.000000000 +0000 -+++ iproute2-4.5.0/tc/Makefile 2016-03-17 13:18:18.686689985 +0000 -@@ -88,7 +88,9 @@ - CFLAGS += -DTC_CONFIG_XT_H - TCSO += m_xt_old.so - else -- TCMODULES += m_ipt.o -+ ifeq ($(TC_CONFIG_IPT),y) -+ TCMODULES += m_ipt.o -+ endif - endif - endif - endif diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch deleted file mode 100644 index e704f65c11..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001 -From: Jory Pratt -Date: Tue, 11 Jun 2019 01:48:01 -0500 -Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever, - but removing it breaks glibc's userspace header, which includes kernel.h - instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical - mistake. on musl, including any header that uses kernel.h directly or - indirectly plus sys/sysinfo.h will produce a compile error due to - redefinition of struct sysinfo. so for now, only include it on glibc in order - not to break their headers. - -Signed-off-by: Jory Pratt ---- - include/uapi/linux/kernel.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h -index d99ffa1..f917115 100644 ---- a/include/uapi/linux/kernel.h -+++ b/include/uapi/linux/kernel.h -@@ -2,7 +2,9 @@ - #ifndef _LINUX_KERNEL_H - #define _LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc --- -2.22.0 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch similarity index 68% rename from sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch rename to sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch index 94df85017d..7dbb3a6dcb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch @@ -9,7 +9,7 @@ are only passed when correctly needed. Prior Gentoo testcase for reproduction: USE=minimal ebuild ... compile. -- Linking with libelf, libmnl & libcap based only on presence. +- Linking with libbsd, libelf, libmnl & libcap based only on presence. - Links based on libselinux based only on presence. Closes: https://bugs.gentoo.org/643722 @@ -18,9 +18,11 @@ Signed-off-by: Robin H. Johnson Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler Added libcap to v4.17.0 by Lars Wendler Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler +Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler +Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler ---- iproute2-4.20.0/bridge/Makefile -+++ iproute2-4.20.0/bridge/Makefile +--- iproute2-5.12.0/bridge/Makefile ++++ iproute2-5.12.0/bridge/Makefile @@ -2,6 +2,7 @@ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o @@ -29,9 +31,9 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler all: bridge ---- iproute2-4.20.0/config.include -+++ iproute2-4.20.0/config.include -@@ -0,0 +1,26 @@ +--- iproute2-5.12.0/config.include ++++ iproute2-5.12.0/config.include +@@ -0,0 +1,32 @@ +# We can only modify CFLAGS/LDLIBS after all the config options are known. +ifeq ($(IP_CONFIG_SETNS),y) + CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) @@ -52,15 +54,21 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler + CFLAGS += $(HAVE_CAP_CFLAGS) + LDLIBS += $(HAVE_CAP_LDLIBS) +endif ++ifeq ($(HAVE_LIBBSD),y) ++ CFLAGS += $(HAVE_LIBBSD_CFLAGS) ++ LDLIBS += $(HAVE_LIBBSD_LDLIBS) ++else ++ CFLAGS += -DNEED_STRLCPY ++endif + +# Rules can only be declared after all variables in them are known. +%.o: %.c + $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $< + +# vim: ft=make: ---- iproute2-4.20.0/configure -+++ iproute2-4.20.0/configure -@@ -188,7 +188,7 @@ +--- iproute2-5.12.0/configure ++++ iproute2-5.12.0/configure +@@ -195,7 +195,7 @@ if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then echo "IP_CONFIG_SETNS:=y" >>$CONFIG echo "yes" @@ -69,7 +77,7 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler else echo "no" fi -@@ -231,8 +231,8 @@ +@@ -238,8 +238,8 @@ echo "HAVE_ELF:=y" >>$CONFIG echo "yes" @@ -80,7 +88,7 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler else echo "no" fi -@@ -245,8 +245,8 @@ +@@ -357,8 +357,8 @@ echo "HAVE_SELINUX:=y" >>$CONFIG echo "yes" @@ -91,7 +99,7 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler else echo "no" fi -@@ -258,8 +258,8 @@ +@@ -370,8 +370,8 @@ echo "HAVE_MNL:=y" >>$CONFIG echo "yes" @@ -102,7 +110,18 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler else echo "no" fi -@@ -316,8 +316,8 @@ +@@ -411,8 +411,8 @@ + echo "no" + else + if ${PKG_CONFIG} libbsd --exists; then +- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG ++ echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG ++ echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG + echo "no" + else + echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG +@@ -428,8 +428,8 @@ echo "HAVE_CAP:=y" >>$CONFIG echo "yes" @@ -113,7 +132,7 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler else echo "no" fi -@@ -397,7 +397,3 @@ +@@ -512,7 +512,3 @@ echo -n "libcap support: " check_cap @@ -121,8 +140,8 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler -echo >> $CONFIG -echo "%.o: %.c" >> $CONFIG -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG ---- iproute2-4.20.0/devlink/Makefile -+++ iproute2-4.20.0/devlink/Makefile +--- iproute2-5.12.0/dcb/Makefile ++++ iproute2-5.12.0/dcb/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -130,8 +149,17 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler TARGETS := ---- iproute2-4.20.0/genl/Makefile -+++ iproute2-4.20.0/genl/Makefile +--- iproute2-5.12.0/devlink/Makefile ++++ iproute2-5.12.0/devlink/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/genl/Makefile ++++ iproute2-5.12.0/genl/Makefile @@ -2,6 +2,7 @@ GENLOBJ=genl.o @@ -140,9 +168,9 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler SHARED_LIBS ?= y CFLAGS += -fno-strict-aliasing ---- iproute2-4.20.0/ip/Makefile -+++ iproute2-4.20.0/ip/Makefile -@@ -15,6 +15,7 @@ +--- iproute2-5.12.0/ip/Makefile ++++ iproute2-5.12.0/ip/Makefile +@@ -16,6 +16,7 @@ RTMONOBJ=rtmon.o include ../config.mk @@ -150,8 +178,8 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef ---- iproute2-4.20.0/lib/Makefile -+++ iproute2-4.20.0/lib/Makefile +--- iproute2-5.12.0/lib/Makefile ++++ iproute2-5.12.0/lib/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -159,8 +187,8 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler CFLAGS += -fPIC ---- iproute2-4.20.0/misc/Makefile -+++ iproute2-4.20.0/misc/Makefile +--- iproute2-5.12.0/misc/Makefile ++++ iproute2-5.12.0/misc/Makefile @@ -5,6 +5,7 @@ TARGETS=ss nstat ifstat rtacct lnstat @@ -169,8 +197,8 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd ---- iproute2-4.20.0/netem/Makefile -+++ iproute2-4.20.0/netem/Makefile +--- iproute2-5.12.0/netem/Makefile ++++ iproute2-5.12.0/netem/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -178,27 +206,36 @@ Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist ---- iproute2-4.20.0/rdma/Makefile -+++ iproute2-4.20.0/rdma/Makefile +--- iproute2-5.12.0/rdma/Makefile ++++ iproute2-5.12.0/rdma/Makefile @@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 + # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB include ../config.mk +include ../config.include TARGETS := ---- iproute2-4.20.0/tc/Makefile -+++ iproute2-4.20.0/tc/Makefile +--- iproute2-5.12.0/tc/Makefile ++++ iproute2-5.12.0/tc/Makefile @@ -4,6 +4,7 @@ - emp_ematch.yacc.o emp_ematch.lex.o + emp_ematch.tab.o emp_ematch.lex.o include ../config.mk +include ../config.include SHARED_LIBS ?= y ---- iproute2-4.20.0/tipc/Makefile -+++ iproute2-4.20.0/tipc/Makefile +--- iproute2-5.12.0/tipc/Makefile ++++ iproute2-5.12.0/tipc/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/vdpa/Makefile ++++ iproute2-5.12.0/vdpa/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.10.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.10.0.ebuild deleted file mode 100644 index 1ac42d6ed5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.10.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - ) - fi - - epatch "${PATCHES[@]}" - - sed -i \ - -e '/^CC :=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.13.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.13.0.ebuild deleted file mode 100644 index 3ebc5a14f6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.13.0.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND=" - ${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 - ) - fi - - # Local uclibc-ng compat fix until uclibc-ng upstream can sync - # netinet/in.h with glibc. Resolves #626546. - if use elibc_uclibc ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch - ) - fi - - default - - sed -i \ - -e '/^CC :=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX%/}"/$(get_libdir) \ - SBINDIR="${EPREFIX%/}"/sbin \ - CONFDIR="${EPREFIX%/}"/etc/iproute2 \ - DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX%/}"/usr/share/man \ - ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ - install - - rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED%/}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.4.0.ebuild deleted file mode 100644 index 0150cbedf2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.4.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.5.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.5.0.ebuild deleted file mode 100644 index 907b9ec555..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.5.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.6.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.6.0.ebuild deleted file mode 100644 index f7d0e0961c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.6.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.5.0-no-iptables.patch #577464 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - ) - fi - - epatch "${PATCHES[@]}" - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.7.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.7.0.ebuild deleted file mode 100644 index f31fc56dfc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.7.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.5.0-no-iptables.patch #577464 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - ) - fi - - epatch "${PATCHES[@]}" - - sed -i \ - -e '/^CC :=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.8.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.8.0.ebuild deleted file mode 100644 index f31fc56dfc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.8.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.5.0-no-iptables.patch #577464 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - ) - fi - - epatch "${PATCHES[@]}" - - sed -i \ - -e '/^CC :=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.9.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.9.0.ebuild deleted file mode 100644 index 65942bfc7b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.9.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 - ) - fi - - epatch "${PATCHES[@]}" - - sed -i \ - -e '/^CC :=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_MNL := $(usex minimal n y) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.8.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.8.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild index 2db482db27..81249282d9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -18,18 +18,19 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd - dev-libs/libbsd - !minimal? ( net-libs/libmnl ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) + !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux ) " # We require newer linux-headers for ipset support #549948 and some defines #553876 @@ -46,8 +47,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 - "${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) @@ -60,6 +61,14 @@ src_prepare() { default + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + # echo -n is not POSIX compliant sed 's@echo -n@printf@' -i configure || die @@ -93,6 +102,7 @@ src_configure() { popd >/dev/null # run "configure" script first which will create "config.mk"... + LIBBPF_FORCE="$(usex bpf on off)" \ econf # ...now switch on/off requested features via USE flags @@ -110,7 +120,8 @@ src_configure() { HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) EOF } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.12.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.14.0.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.12.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.14.0.ebuild index c7d27b907f..367b3541cb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.12.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.14.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic multilib +inherit toolchain-funcs flag-o-matic multilib if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -18,69 +18,80 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) + !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux ) " # We require newer linux-headers for ipset support #549948 and some defines #553876 DEPEND=" ${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig " PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) +doecho() { + echo "${@}" + "${@}" || die +} + src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 ) fi - # Local uclibc-ng compat fix until uclibc-ng upstream can sync - # netinet/in.h with glibc. Resolves #626546. - if use elibc_uclibc ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch - ) + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die fi - epatch "${PATCHES[@]}" + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die sed -i \ - -e '/^CC :=/d' \ + -e '/^CC :\?=/d' \ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi } src_configure() { @@ -95,21 +106,34 @@ src_configure() { ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile popd >/dev/null - cat <<-EOF > Config + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + doecho ./configure --libbpf_force $(usex bpf on off) + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) TC_CONFIG_NO_XT := $(usex iptables n y) # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) EOF } +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + src_install() { if use minimal ; then into / @@ -120,6 +144,7 @@ src_install() { emake \ DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}"/$(get_libdir) \ SBINDIR="${EPREFIX}"/sbin \ CONFDIR="${EPREFIX}"/etc/iproute2 \ @@ -128,8 +153,6 @@ src_install() { ARPDDIR="${EPREFIX}"/var/lib/arpd \ install - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - dodir /bin mv "${ED}"/{s,}bin/ip || die #330115 @@ -142,9 +165,11 @@ src_install() { sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die if use berkdb ; then - dodir /var/lib/arpd + keepdir /var/lib/arpd # bug 47482, arpd doesn't need to be in /sbin dodir /usr/bin mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.11.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.15.0.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.11.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.15.0.ebuild index a09e732185..367b3541cb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-4.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.15.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic multilib +inherit toolchain-funcs flag-o-matic multilib if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -18,57 +18,80 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" # We could make libmnl optional, but it's tiny, so eh -RDEPEND="!net-misc/arpd - !minimal? ( net-libs/libmnl ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + selinux? ( sys-libs/libselinux ) +" # We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex +DEPEND=" + ${RDEPEND} >=sys-kernel/linux-headers-3.16 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) +doecho() { + echo "${@}" + "${@}" || die +} + src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 ) fi - epatch "${PATCHES[@]}" + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die sed -i \ - -e '/^CC :=/d' \ + -e '/^CC :\?=/d' \ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi } src_configure() { @@ -83,21 +106,34 @@ src_configure() { ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile popd >/dev/null - cat <<-EOF > Config + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + doecho ./configure --libbpf_force $(usex bpf on off) + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) TC_CONFIG_NO_XT := $(usex iptables n y) # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) EOF } +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + src_install() { if use minimal ; then into / @@ -108,6 +144,7 @@ src_install() { emake \ DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}"/$(get_libdir) \ SBINDIR="${EPREFIX}"/sbin \ CONFDIR="${EPREFIX}"/etc/iproute2 \ @@ -116,8 +153,6 @@ src_install() { ARPDDIR="${EPREFIX}"/var/lib/arpd \ install - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - dodir /bin mv "${ED}"/{s,}bin/ip || die #330115 @@ -130,9 +165,11 @@ src_install() { sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die if use berkdb ; then - dodir /var/lib/arpd + keepdir /var/lib/arpd # bug 47482, arpd doesn't need to be in /sbin dodir /usr/bin mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild index e1242c6c5d..367b3541cb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs flag-o-matic multilib if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -18,58 +18,80 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" -RDEPEND="!net-misc/arpd - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 -DEPEND="${RDEPEND} + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.16 +" +BDEPEND=" app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison + >=sys-devel/bison-2.4 sys-devel/flex - >=sys-kernel/linux-headers-3.7 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) +doecho() { + echo "${@}" + "${@}" || die +} + src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 ) fi default + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die + sed -i \ - -e '/^CC :=/d' \ + -e '/^CC :\?=/d' \ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - # don't build arpd if USE=-berkdb #81660 - use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi } src_configure() { @@ -84,39 +106,55 @@ src_configure() { ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile popd >/dev/null - cat <<-EOF > Config + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + doecho ./configure --libbpf_force $(usex bpf on off) + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) EOF } +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + src_install() { if use minimal ; then into / - dosbin tc/tc ip/ip + dosbin tc/tc + dobin ip/ip return 0 fi emake \ DESTDIR="${D}" \ - LIBDIR="${EPREFIX%/}"/$(get_libdir) \ - SBINDIR="${EPREFIX%/}"/sbin \ - CONFDIR="${EPREFIX%/}"/etc/iproute2 \ - DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX%/}"/usr/share/man \ - ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ install - rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - dodir /bin - mv "${ED%/}"/{s,}bin/ip || die #330115 + mv "${ED}"/{s,}bin/ip || die #330115 dolib.a lib/libnetlink.a insinto /usr/include @@ -124,12 +162,14 @@ src_install() { # This local header pulls in a lot of linux headers it # doesn't directly need. Delete this header that requires # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die if use berkdb ; then - dodir /var/lib/arpd + keepdir /var/lib/arpd # bug 47482, arpd doesn't need to be in /sbin dodir /usr/bin - mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/metadata.xml index 0fa0b4cd78..ab92eca64c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org @@ -7,7 +7,13 @@ build programs that use berkdb (just arpd) + Use dev-libs/libbpf + support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend) include support for iptables filtering - only install ip and tc programs + Use dev-libs/libbsd instead of internal funcs + only install ip and tc programs, without eBPF support + + cpe:/a:iproute2_project:iproute2 + From a5cea839772ff9e469d72cedd2ee0d95bd9322d4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Nov 2021 13:34:40 +0100 Subject: [PATCH 5/5] changelog: Add an entry for kernel updates --- .../changelog/updates/2021-11-30-kernel-update.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2021-11-30-kernel-update.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2021-11-30-kernel-update.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2021-11-30-kernel-update.md new file mode 100644 index 0000000000..61b593fe00 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2021-11-30-kernel-update.md @@ -0,0 +1,3 @@ +- perf ([5.15](https://kernelnewbies.org/LinuxChanges#Linux_5.15.Tracing.2C_perf_and_BPF)) +- iproute2 ([5.15](https://lwn.net/ml/linux-kernel/20211101164705.6f4f2e41%40hermes.local/)) +- Linux headers ([5.15](https://lwn.net/Articles/876611/))