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

["Michał Górny" <mgorny@gentoo.org>]

commit:     81cb9af73844e8aa4f53ec878eb8d22f9be7a887
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 19:52:17 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  2 19:53:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81cb9af7

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

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.8.9.ebuild                 | 161 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index af4934243d06..7bf359b7bc4a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.8-10.base.tar.xz 574628 BLAKE2B 87b6006dd317b24157dc7af3e0386f
 DIST genpatches-6.8-10.extras.tar.xz 3704 BLAKE2B d836e79733083c5587dcb63d1fb3c30c7b91aee70660681b5fcfbdf90d4ba6fdca09dcbdab29588d267e07ffa8b338223e9590539356fa862e8fa211827d6f9f SHA512 bb01fb545a182d3073590939b172755b1883e827b6687870f889634ac00949308fd62e0d870e6d6d18d8c517dfbeafd3252f9b61d589522cf5c9d09d534ec6a4
 DIST genpatches-6.8-11.base.tar.xz 623140 BLAKE2B ab3aa16e717dc0ad99893ac73e6de6af38e83f09722088596cb0ed55d77a33c8f490c3ce81c0757933ff28bd068430adcceb99395c0a7b92c6713b89566d92a4 SHA512 19bd09eac56870b47f14373d648f839effe0e7e913cb7f61fb3c17e4f882768020c4069b72a7a384224116f5cd6b7a93b75b960a14d24c7e71fa1a083ab4c506
 DIST genpatches-6.8-11.extras.tar.xz 3704 BLAKE2B 43eeb24741d062e81942c599bbfcef5bb648597f0cdadb55d71b0c3b8fc154dd8b2ed97ce4fa3beab1eb48afb2dddd030581067fbbd7baddcab8d526aaacf8b9 SHA512 3bd3c9432b380b3969c9fb0b6c750981902b0253b49b68852db70504121e025213935caa98111ef5ba924905b384dadcc5cb6b12b8691c5baa8d6c738589bc6b
+DIST genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6
+DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c
 DIST gentoo-kernel-5.10.215-1.amd64.gpkg.tar 63252480 BLAKE2B 30c8716c1cdf331cfab8d7eb95d5adfef7a400e040bba5b83456a1d4d58becfbce2f198c9db5ea7c269373326ef5ffba8b56f640bb9b8bb6d5ee4c24ef6ae296 SHA512 3c1d2177ae1209cbd84eb93f6b1a1282bdca00ecc0f85064dc4491cc5f67464a41ec8080174e6bf84ed69bcfb963248818b725a95537918eb427f4fd70f8646f
 DIST gentoo-kernel-5.10.215-1.arm64.gpkg.tar 56729600 BLAKE2B 97f46a4c9924a89a3cec0fcb32562cc97cf0a125d34c56c852e9093b3657ed01adb6809f1ee7f27e73fa8f2598807ad94768397ba233fd0d64d79bf57167c9b4 SHA512 cc4a2313ef2765c40e8d7d3d682c443890fc731723c91a2c53c959c38a4819c28a260bb18dc3747f005ce5f6bfcd3060614b395125c078aae29d1662634cbccb
 DIST gentoo-kernel-5.10.215-1.ppc64le.gpkg.tar 52889600 BLAKE2B 1c56d8fae69f0780c3ea465c0cec3e4cb32b850e79141f8031a023cff187a70df822de8012a22acefdb14d8958edbd3bd1bfbfca0ab28138f967f0bc02a9aaf1 SHA512 dcd61155c9eec88dffaadd95516dc99b9d6a29cef9578cb7e1d4cee10927ffd34ea56ae6940af82ee48ea2b83888dfdc6eeeec419140a02866326b2c36d07b26
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.8.8-1.amd64.gpkg.tar 150845440 BLAKE2B 21ab1a43ecd330a4b256
 DIST gentoo-kernel-6.8.8-1.arm64.gpkg.tar 122419200 BLAKE2B 31930852c01971e77d14bc1b4479c279746c567d453d019d4bf6ba4bd1ad837001e307c6d09cadf7af265931d53af64fabf3d5de04786f72b2c692535e07f322 SHA512 d2f0a6628949e549819fc4250ba27990bc3c53b0b930f1256e5d5dfaa07e5dcc13d0de3ecf6db13458d6f07679f4fe0f05273855727fa8b0681c951dfa9e6e7b
 DIST gentoo-kernel-6.8.8-1.ppc64le.gpkg.tar 66273280 BLAKE2B 4c87b1e884792c8102c12c37dba0d0cacddbc2af10287c5739aefade661b92eec01a0ff3cbbda0a15eb2dc008c0eefe7bba91890bbe45e423e730a4acde925f1 SHA512 5e799fa7614cf113449f4fc91194dbd566324e56d49477404fcfa71390e379a5d80b1e4df244f02f02d36438ba0054a8f374951a492e4212b8ded16968f04dfa
 DIST gentoo-kernel-6.8.8-1.x86.gpkg.tar 69980160 BLAKE2B 5a7a6cc7252f05723ac848e0181d3b27b4810d052f3f5da21650eeff10519bda0603667dec1c794f51d26c318c99944bd94127aab53f2a30d2ce120f12ab6b8c SHA512 41ba320ce21129ac7365eed3582497d954c0c732bcfec785873aa268459305253798eebc10a271460d9eebbd4012c256db5ee8c0dbd94fc4846d30495e3d229a
+DIST gentoo-kernel-6.8.9-1.amd64.gpkg.tar 150845440 BLAKE2B 535d166d00958e4b4e499704eeedd76ff24a40df66914fbd54bb8574091d0c71f743a3da19f1f0b39798d537a56e5e45ec9d8dc0dca04fdce04d19cc3f823ae9 SHA512 09c1baf319b212def006d285dc307c59cf581dbdf892998f7eb40d76f453316ebe081de52a068688125091459c6bea5ad120c5851f53fa74b6c97f4014fa28b6
+DIST gentoo-kernel-6.8.9-1.arm64.gpkg.tar 122408960 BLAKE2B f74cc8f857e07dc82d1c6150074557ac33e668c4b49178612dbfe07e5291038f0ea4ab21dff4f3c556db5beb003cf6d39775685833106b9c51c1aa27178d47ac SHA512 7c87576ea64840555c1f38042c87359219f6b35f35a557ba155b9c930ab72c7316b58d7c712565ee6296c80591bc0f45116f56ac286c756bf25433003e25e07d
+DIST gentoo-kernel-6.8.9-1.ppc64le.gpkg.tar 66263040 BLAKE2B b9e3e8bfe611dcdc66e46623e2adf09d7d10bf4624be28e1d7df312ef6a2fdce40af669c4a5a63698871bea0c70361ce580557607f1103b873398ff865ee5d30 SHA512 bcb129a0941a2b5ac4847a97c688f6144dba0db1ae43542b7cad9ccef7825d9a8dcdb6218c43f549269a2682c59fc7cec86134067cafe0cb0fff3dc31566129a
+DIST gentoo-kernel-6.8.9-1.x86.gpkg.tar 69980160 BLAKE2B 37f657c5488ace494dc16355d7dbeb0cfd4a88dd5a4a44f51f392c2414ec4ad95fdba2b6c25b3f6bec4c35946ffe6e5f950c71745ae0ad6f4599301471c6a0a9 SHA512 cf53baeb3b80b4030d336001eed7a6973c1451a7ba02d020e30716a11b1c702a8ad4fcfec69ddafc441d3d9232fbb61ed1d08811208c828ecf0a68bc4f8231f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.9.ebuild
new file mode 100644
index 000000000000..9a4e621d4db6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.9.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+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/-2/-1}.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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	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="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+}