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

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

2 files changed, 167 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7926b81447f4..5a79aa8c315d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.9-3.base.tar.xz 22900 BLAKE2B 6cc860e07ef37d83920accee580c0dc6
 DIST genpatches-6.9-3.extras.tar.xz 4052 BLAKE2B 5c97314b601fac604449ffd391d3c1389bec1a5c5bebc3a7fc3678c44de8bee31431f01567ea7b239ac62c22c149d4e563f6f52336f0eced4a105b99a1a3b93d SHA512 84ef3f91d3c9823b7371022b276d3b5c7bb86fc7be00aaffeddca171438c21f70291e67c992fa75f7222fa964f049be2816bcf7e081e35fbbb31d68da8c5bd08
 DIST genpatches-6.9-4.base.tar.xz 158304 BLAKE2B cf964990abe6f7428e3a590752519f9a0bb16416186f06e6e377a33fc48acb42b38515e5a628f3394b418780fbb6b420636d6b896ea92906578e0bdf57b6125c SHA512 ad9e039a8a7ee29a5c258b42cd688737c9c575c097ced8d23792bbb2856480081a64cfc65488e5c0c8d5c6cdab9016be22183199ee8357c1c1ca372360035b1c
 DIST genpatches-6.9-4.extras.tar.xz 4048 BLAKE2B 7a47f3ef9bd870175c4373d064316fa746c3480a4075492fb04b4eca4496ab2c33c713875997a4fa33695177bbade0b6686f7d7e4f2cba110cd89a0f2017e2cd SHA512 5cd79406ad14a07fb95fc94a5aaee2bcd18f143996c111e16675b77402e9ee0917fd51f2a2023fd58d462caa2edfe5a950eb72bdb04870b185012b20ff302560
+DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B cb961b8245eaa58405bf758f4432f1ad98b767d7f9ea8e45fb440bd2616e67c6e12cff6ec3af89748f19043c9b0b58b634e28e7bcdc469fcc4daf2f752b3a438 SHA512 60fb3290eabe8289fc4acb4f1df809ace44d7678188683b64ef2ec92edb8c2ac0d757280ebb63087145fd068e64619a3b0a9227fd5f3061099d287e8e8dd5720
+DIST genpatches-6.9-5.extras.tar.xz 4052 BLAKE2B e72e5a5195db42f38ed671899217d7609eb8a5d9f954ebbc36a53a88fcadd1cadecf7257b33a880661e949f2c7b176a5762ecc1e56be0195e6768d8be8ae5fc4 SHA512 3d9315afb5c45cf24f6e5287048d49f6969e49ba2c8f339d9f4da0f5a08708ffa65636c3d24efdcfd246f6d28c72535089078971e97f7aefeb75119a67cee11d
 DIST gentoo-kernel-5.10.216-1.amd64.gpkg.tar 63252480 BLAKE2B 787a17da61971c776a2ad55f2d95487073e31a0fa7765b564ff834ea6f6d406b685775b542d3eb25479c10c4348cace5a8c563b2c76c6b39054f0c6e6631a0bb SHA512 46fff78b78b7ca0989e95fb26bfaf9beeb353b943a10c8f6dc837f47133b0109f69d8810da6de6f006176401dcc04fad4a38d1a4b07b56fffa6672c96f26e714
 DIST gentoo-kernel-5.10.216-1.arm64.gpkg.tar 56719360 BLAKE2B 61a5d2a3eb4dc5434646cea9103f34c8b228c6eb337fd031e669836996e3f28dd718106138af1bfc6f8c9e193e6976a0380e20146ba9f131c876255a9e513ea8 SHA512 848b340e05a9be6cca74c5f1e0f876c74836929f84a1bee43bdac53bb65723da4fc6b56d6c02cc2179b01cd97a62199aa971e6d3169c25fdca6f8603e0639884
 DIST gentoo-kernel-5.10.216-1.ppc64le.gpkg.tar 52869120 BLAKE2B 3f5eb4bb82b76321988baf7187fb550794fc246fc369d2006a2337c24c5793ad3e2f9afa1c57b5121e43283d3195e1042f2ec35dec25593c0c7a14d74ad0acd2 SHA512 dfa92819e87f23d37cd51efae717837f3a08300f9a3bc7b7f7a6860178e5b87ec8203087f6d3120565c32589fcba9a70a473e3c708fd5522f45eda8bcdd1003a
@@ -118,6 +120,10 @@ DIST gentoo-kernel-6.9.3-1.amd64.gpkg.tar 159006720 BLAKE2B 943a97a16508790da5bb
 DIST gentoo-kernel-6.9.3-1.arm64.gpkg.tar 129740800 BLAKE2B 7d8c55762a8f08b773faf2b94bfd6acce9eb9f0a8b4e82f3d8bd6b5cabc45edb7bad1eae0094985a8243bc330353edb91deb1bc6bd6bf317eed69dde0c9436ca SHA512 09a6a8f69f0288c75fbce41d27a6ea8319c75a3f8c6448052df230656018ded005de439874439fa55d01156672cfb2bed8edc734aa4e65dd9db55043a1b9822d
 DIST gentoo-kernel-6.9.3-1.ppc64le.gpkg.tar 70707200 BLAKE2B dc293f04a35f415d229b00fad80fb9c83b4a4fc5626d239d1e26a67256bba1b5b6973fc0337d170fe4ee4ace1ece68c523663636e368e81876bfc42041ce273a SHA512 0895f6afef9ca6f9e563c3418d359876a302d767159dead4d8fd69d47a3af144c409dedd9e5693a26b39f23ea4383506057b5db822ee8672dfc4066d935cb90d
 DIST gentoo-kernel-6.9.3-1.x86.gpkg.tar 74844160 BLAKE2B 16e5c6ac774afd97a089f20e22f997d1a73af7be3a47c8efd2e83ece154abe36d663e5ef8aa04b1083e0f522f3d25d8eb61edb35c84fcf6dc146f8bb25f6b21e SHA512 2a0231d9e59de193f02474daaf629a871fce56b2ea1eecd83a446019a38756389443da318460b093835ffd753b321addb530aec4668c2167e18c16386e098e34
+DIST gentoo-kernel-6.9.4-1.amd64.gpkg.tar 159006720 BLAKE2B 9e2189d7ea4546bf9d3a937ff0f3cd95929749931b4850a198c543b753a76e6e2305492fa4cd03ca3221c070107b6b1e76cee3eb5c066ca273d0b8b4b2f67efc SHA512 87b26e414a79051271531e6152b10ac11b6834983e9bd500056a4d95aead6efd2bcd45ec0456973cd464ee4b66349929e0db1cacbab50a7b8e30484293377166
+DIST gentoo-kernel-6.9.4-1.arm64.gpkg.tar 129740800 BLAKE2B aaffce5d2f922f53de6b4ebebd23ce2edf40731e79a325bf07502f0b61f440edf85d6551ac70f6d96f539ff3636091e7aeb478e74b7e45fc0adb5b8add5f31e9 SHA512 61ebb357a3a4d4cb80f90bdcb5e8ab02c810b1a39ca4aa95a2bb3be56e85435625c427f3ddf93313623e42ad81aac7a206c14eec60865ed7d661d1451779dfd8
+DIST gentoo-kernel-6.9.4-1.ppc64le.gpkg.tar 70737920 BLAKE2B 02097895e96decedf998bffaf2c442623e27c9a530c7f57dc6a6bbe7bc566142215d90a71055ea383e63d146d77cb4c3b0b3d017156f4f8f1cba22ad46bc2f0a SHA512 9057f864de4f15e7b1911f91e21cc71c888e95c26035ea3246e0f116d5a7817266ecea2e08cf1f9eb09bf41481be570034638ee1775f09e39901c599bd6b4d90
+DIST gentoo-kernel-6.9.4-1.x86.gpkg.tar 74864640 BLAKE2B 20221f3def72875073f8082ac9e0c4c93ae047e5b027385e48d9fb75ff32ffcb9b7aa254dde566346c98570aa78575aacbc7b015db19120258a169d47b1ff3cc SHA512 4d9dff99e8354e95c0e2ff687d7eb4a78f0715ea6aedc582add5715ee3a227ce9933de8a20fc8c155f5d005219f970c8874694c4df20c754a731d71beed600fa
 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.9.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild
new file mode 100644
index 000000000000..5af44cece78d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.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##*.} + 1 ))
+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
+}