[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

["Sam James" <sam@gentoo.org>]

commit:     f21b5f976e1224aa267d6076e8adeb0cb8f3bdeb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 01:58:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 01:59:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21b5f97

sys-kernel/gentoo-kernel-bin: Bump to 5.15.125

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.15.125.ebuild              | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0f4a5e2c6f25..ca070f9bdb10 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-129.base.tar.xz 5079636 BLAKE2B 9dc533ca9995f272c9f69c277e0
 DIST genpatches-5.15-129.extras.tar.xz 3932 BLAKE2B 899d47c7df1aa674c6438d2e0e5f70aae7ff0be55ab663d533191721791673f60c90a00b8b42167d99e750a428a65604af84f47aa385049ac91b6599db547b72 SHA512 ff342b8a47ccea5ae86bc4a499a145a331e9c5c52f2ea84b1baa8b17e11d5aa6504fca9d594960c903cbaea65cdd53aa6e634128296b0c76cdb6d4e9bc9c1ca5
 DIST genpatches-5.15-130.base.tar.xz 5153200 BLAKE2B d06514f48706208faec58f2a0f15da99e6e5ca6e311678b307f1734d6d0bc1f86252c6a68f144fec10298e05d27bdcc9d2f09bc2be81b2afb0c2cd2c1cd42d55 SHA512 21943da272b5279b4b85a1ad16a05b6ec21157adf6aa925d97d3ad34cbd46f084df7ecbe6519915ea9ed26de47312aaec92d2a76c30eb5b8da1289a4e3f34d28
 DIST genpatches-5.15-130.extras.tar.xz 3928 BLAKE2B b4b1c6d6ff12356679a50263b39108cb8f9123baa6a3641a33d102fae71fcefb49303582e2509884183c251dbb4a5cff3183cfd60122ed5ecdbd859505bea6bc SHA512 3f0ac344f138b8f7bfbf136a814c4fa3eab7740657cb9b6284fbe6e0465dbbd4c0d411db8cf8621c53f91df05acc42611e5948d9b6b56e75e8b9be658ac555a3
+DIST genpatches-5.15-131.base.tar.xz 5172044 BLAKE2B 913e2f0c9eaccb8fe22053d56c9be5819addef580731852183a1b6485e5885cd5b7aa48fb5bcf325f4f54b4842a0a0e1a2f04cfca9dbf027ecb00a4259795d5e SHA512 f94c5ccc20827a8c4c65ee8a5ac92531550ea97bad4553bf8e2580e271036a2fb04fe3bf40c63a477e9f962f709500e84db217127e84d36a73a7839d91d8dee5
+DIST genpatches-5.15-131.extras.tar.xz 3932 BLAKE2B 013b0ce4605c9ac1bcdb50ddcbc562ad65c863ca2093fb2a9911c3897a043abf4095c520a154746008ca9b117d28703b8fdab35ecb72f214090c3253494d7b64 SHA512 8836d9e06084018b45498b10a2492d4bb53af8b6dddb278e1f08f1af0ccb874914603f21834b681d1300cd307107295540c9ba001466c50014262efbe6040efe
 DIST genpatches-5.4-257.base.tar.xz 5959056 BLAKE2B c3c4f47328f4e3ade669e1cb4586a2420618b647fe6cb5d96210cdb8d5baf767d6eb6d9efd4ac48eadaf0f2b108569656c43b2b43a687b635daf9c91475491a1 SHA512 1231ad3f7ceb0451d9aa5a96be803eb48a5656fe63476ec55ccb71a96eadd2c12d2e44074b302b9c2770569abda60275c0ed161b3786d2dd7be6b0a49d4e4f55
 DIST genpatches-5.4-257.extras.tar.xz 1812 BLAKE2B 480e82ea79feb52785fc6643c883093f42240395a1d953cd1e5331c012cf64c6f4b292e878a938a9c5bb297e96ab9f80656839de6044c9f1e76c668c2c8e1ec9 SHA512 5322116802c6c0a44abc81911bb83fd7d4aa5b5f7fb4bb35ca78c47c6c0afb188e21a24cc5ac4e2810affa13689c902e97062d66a751630cf0722a2b28b1d83b
 DIST genpatches-5.4-258.base.tar.xz 6040776 BLAKE2B 722214955565832dc7ae8719e4c6a6a6c44822469ca73ffc7a4d6ac4ebd5b8c2e04b127ddad873f3b434cd21803b54c385f7de750386494b0995a19aa44cd2c1 SHA512 12b0c24ace3e4376bb377383d14224822f4244caeb687d070be331687f0b98f4c0c85866dc65b78450b76e7628e4ab403b15164b1ff98c45f720cf7d98070442
@@ -48,6 +50,10 @@ DIST gentoo-kernel-5.15.124-1.amd64.gpkg.tar 69550080 BLAKE2B 326a56dc3786d8d8a9
 DIST gentoo-kernel-5.15.124-1.arm64.gpkg.tar 62525440 BLAKE2B 5d35e755983bb2271e1e3beca216ac4c7d30b5d9847a4c9ff9fd36cfc70cf19035620633362060e12399f50a75c05900a45c475a5d94e022004c84db9bf5b12d SHA512 42b1a812c8b9dc2f06bb00b7cd251035f48f7fed3bd6034c41c2deb7fb7343075c45a1fd03e59949f2d849c687480bd1ad79ff94e2a7a232d70bfb66cadd642a
 DIST gentoo-kernel-5.15.124-1.ppc64le.gpkg.tar 57108480 BLAKE2B d3a69a0d1e6141e937df65b74b02a4c13081eb867c496f3e3bc91a7ffc2c1716ff7058395da6c7fb1fd5b399e56ba535f91452c7f24cb7e90c5757292606a140 SHA512 17d7745ed971b9cb01d62a6b31e049c44dd5ca461e53d4a0609097cefc52df16c6a4ba1060a22d0423efd2dfb805273c15b88aba109357eee855b67fd1a3a398
 DIST gentoo-kernel-5.15.124-1.x86.gpkg.tar 59136000 BLAKE2B 299dd60bb17a13066be2303b42ec3f4f921ea1551d4de1ed8643639a5be5d148659a2f091e2b6e7a839d2fea4455bfd955c78988627d311d2da0e6e547026451 SHA512 a3e6edb8000d17ad96f29506af645ddb39b1a66381f557522abe0225694d34cb9f559f8e09cb4ca0cce6dd97492b812bd94618b63f087cf79e4afd66a5d036a4
+DIST gentoo-kernel-5.15.125-1.amd64.gpkg.tar 69570560 BLAKE2B e822c1788ca06c2a6e4edbe486838a6022c6731992f0ba2f4264766878dc64d70832cc02ca67260f325b4b7c4138a8c2a710d3e1c228915f7bf184255601784f SHA512 54150a65178d768666b0405cdd3ac20f2f3b2448dedef49d9317a54f1e07b07b8faad9e8a80adffd91c39e1346109a17d13a1429d56564be771bf24143fc8893
+DIST gentoo-kernel-5.15.125-1.arm64.gpkg.tar 62525440 BLAKE2B 296682eeb94cc1855be39a0b2d6d3af830e81546a319ee445b79a64ef689820ca72b739a403989fa101e1c193bfead1a8772563e514b4bf27b017aea321dd8c9 SHA512 b22c4244fae0b629b4ba630d0e4257a9ec208c2e97241b03f6f9b1027cdae6ef345fdc270c725ac1fbb509db4288546dc7f16c090a5bc9017e5a9c058446b864
+DIST gentoo-kernel-5.15.125-1.ppc64le.gpkg.tar 57108480 BLAKE2B 295a7cabc5b3e4672bd5fefdd8ca5c011b21ffec29b81807e2ea458230155cec5b4e1f5927000d51e4c62c5e1c3f2b6fd4de381f866ffdc37477e9e23ba1960f SHA512 57e36f3d8887b1594225bf4abf29f46beda9f4a5efe46680f93e1227ee5ae21f987966a9ad586e98ae9aa1469bd84591fdecb76534e8c813709c72521cf8f830
+DIST gentoo-kernel-5.15.125-1.x86.gpkg.tar 59125760 BLAKE2B c860552eed54a9dc9654b7585c6c808c643216b3ea3d1c05badb35c335adb85a1a4a7d9b60862406da4f274ce0915e24af37ac6b9cb55e77b86026b80a2682f1 SHA512 ab3ff8ce87c2a15097c3db2e1cce4ad4e72cde1a90b4d2c30e5e9fbf5c8884578094ee515f5fdd909d9125d46636ed1a558454bc4fbd0f5d8267639e56ff6933
 DIST gentoo-kernel-5.4.250-1.amd64.gpkg.tar 60508160 BLAKE2B 053d8d9b0749cf81edaec06ddb8cb9a48bb2ad7c3648e08504253e24a8365e2882e09abf0cab2f8a667e99a348b652aac79050e54c8d0e074b53cd5a159573c5 SHA512 50a07346595729a8ad462c36423724a3e74c2496892764be54034b4318ea7f1a4aa1a6bd7fdb0401b78e48fee6755f603e59bdf10a22fa810f371fe472877f8b
 DIST gentoo-kernel-5.4.250-1.arm64.gpkg.tar 56524800 BLAKE2B 7a170a4f462ffeb2a17e394857581d3fba3dad5fb4f48bf6c891ecbf7eb73c7c6b03e3e7164c90af6944bc055d43dcd1431192e310c54c4b28aed1f652666e92 SHA512 875dde5172de80ac27a53b8a4e38e7744f7ca6361ffbd80fdaa6a6491c1d5d44064bfe010a0ef5ca638f9bbc58c1e1bef7b32f087a4aceb672c9ffb1892c3921
 DIST gentoo-kernel-5.4.250-1.ppc64le.gpkg.tar 54200320 BLAKE2B 5e18420429060f5f2c58ceacc570bfbc715f4d76fb80efe6544fc7a2924f37ec4d8739edc2a49a607f89d4243c1aed714fddd8f6ff9bf1283fa673281cbcfa6a SHA512 aacebe370ee7187945db2ee8481d633f6f41da9c045c7a5a4f8cbb1407efb2fd1cd1ad1abe881c54bcc706610d50f3ee0c4ab1f2f039c951e98cc26f158c0f93

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.125.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.125.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.125.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}