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

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 d414eff30574..f17309a47d4e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc8
 DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d
 DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e SHA512 e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1
 DIST genpatches-6.6-37.extras.tar.xz 3736 BLAKE2B e54e5dc4b2cc854dbac9fc0d03dad93cbe4aa639142090271abcc0e797ab28e3377986f46767df8d6802edaed058e1b3999067c96d05ec8bbb42f48e33f96cb6 SHA512 be6299eedccde2d9e4cd37d4df14ef6c6a404892f18c40c4acfac31dfd20f1f0c28be767fccd8a7ee0817b32490057c76fc01d895f979686ade5a0357a59515b
+DIST genpatches-6.6-38.base.tar.xz 2066552 BLAKE2B 61205dc2b5d17f15af23d8eb8af0720fe5f6c560ae671c98252d7c9e28e9b93fdde067811664f095ce103beab9bcb1810e9ab9e32a82d972cbbb44ce5257f097 SHA512 ef6d0814f5bd646c49e54fadc46e73ef118466978a6fba1bd18d832e6dd089a1699ec14f40e769e061bdb84f843e94c190b31729b48a36a317d66da6a8d00622
+DIST genpatches-6.6-38.extras.tar.xz 4052 BLAKE2B 7d25eaaf329cc043fd5189114c5d100f2a3dad9a97b0c87cfc9541ff95ffeb9e3a8a723e5c4fa1f9241c4fd67aac5aa1e4aba96f5cedad5609463b96bc272da7 SHA512 d5957d7ca9718bf87621fb4200b5bbc4e1457fc7fda1500714fc88730a4dfd4dce81e386bd2a2f88e02aff16c46e35402421439e6393a5ad15848d26d9056b44
 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.216-1.amd64.gpkg.tar 63252480 BLAKE2B 787a17da61971c776a2ad55f2d95487073e31a0fa7765b564ff834ea6f6d406b685775b542d3eb25479c10c4348cace5a8c563b2c76c6b39054f0c6e6631a0bb SHA512 46fff78b78b7ca0989e95fb26bfaf9beeb353b943a10c8f6dc837f47133b0109f69d8810da6de6f006176401dcc04fad4a38d1a4b07b56fffa6672c96f26e714
@@ -42,6 +44,10 @@ DIST gentoo-kernel-6.6.30-1.amd64.gpkg.tar 147240960 BLAKE2B af0b3a2289bb6b4160b
 DIST gentoo-kernel-6.6.30-1.arm64.gpkg.tar 119306240 BLAKE2B eb6a34e2a34873c64079dc0370bd750818af440eeb9fa2020c42755e4ce00774d80ab595fa2a35a5e706603ceafce03cf728750cd4d3148a4ef3ad897468fb4d SHA512 b05e624b34bb217137eaa3d984502a0408019b70c2230c380ba19264cdc586d6401802916e03863f6c36af933a095d0ebc53d3b880c6f7fb7d8bdf6bb9a60c10
 DIST gentoo-kernel-6.6.30-1.ppc64le.gpkg.tar 64389120 BLAKE2B db436724c0a978faabd8cf7ea6d4c6c1dc5c8537de25a95c6af142a3ef274612d4fedcb92a394f536c4f8431fe78e1cd946c5f2b7eead01fa9a0268f38870217 SHA512 cc01db0e74aef830c130e029eedd7072853413875cb436aaf1d34baef1f5fb1596b04fb16b9a2882c6625eefead272d1ba29de37afa43eae67ed97167ada9783
 DIST gentoo-kernel-6.6.30-1.x86.gpkg.tar 68341760 BLAKE2B 2e931cf3d3dda1958c969261302811db5fef3ccfe6ac0a24a0cd69382c4e6c01613f78e9131e048c7a908bcff9ec069f1602f4c007ef6658efcf27e383adb2c5 SHA512 ec63fc1e2042ee83a2dca56a88dfd637d106151c7e1ec6607e5ac5ae6e694ba2dff88d957464793f8d042af6b4e7ba9bda6b624497d0db6c4130dbb5393122c2
+DIST gentoo-kernel-6.6.31-1.amd64.gpkg.tar 147333120 BLAKE2B 52abf0ed45cdcf3bcb22af1127d3412a9c9842d5eb3e97eb84201cb1859938ec5b9d99fce01147fd64835c06218d0dc6d85cba8e47e36b53d641198f108ed272 SHA512 f063fd03f893b0e7c128426ac5acea3b0844c240b7537cf4c3714a9349d6a422966cb305c2b7a20759de3b19f3e88ec0f68e63bff6f664a4229f8f6ab14fb204
+DIST gentoo-kernel-6.6.31-1.arm64.gpkg.tar 119326720 BLAKE2B cb9d21a8084a1671a61668ae62c0dd7e38a1d0f0589b79196ad7c81033e789541336be6ed5a1e0e4a885475f9aeed1bcf40be4e95eab581094a96b90b318df4d SHA512 9163959e18b9c1f8607082b00673baa07a3b6786549091d42e52f81a5c7208e55b4e427adbd22297eee4471443df78cc9d7f433bb7032632d5fec817b5aea412
+DIST gentoo-kernel-6.6.31-1.ppc64le.gpkg.tar 64389120 BLAKE2B 1b6cd46804c1f67e6b3532f79ed738eab68cad833a08c728df765eb1986348a45f80eed496535e2fb1eb508c8b4f2cf03399e57437466af453f05890f40c3242 SHA512 981401200780db5f1bab92b96e05e5120641867d7bd83d91ed9979f08b5158a67fa3570ffc8048760911a85fbb2e7b186277203a8ba801ab9e02acf94fa61e09
+DIST gentoo-kernel-6.6.31-1.x86.gpkg.tar 68362240 BLAKE2B 3a83d8ff3ccc520a1bfbeef07ea0faf2870bc8b0efc0eacc47cb817e4f157e6a78ccf47d2fe95adacc5f38e5af8da7e851171de3851fb8de0b7135933908bcf5 SHA512 ba80ffcbfb0a84fe1a70e7838921ebcfc7a1d5680247cd14968a0236a8de5ab8c4ae0dd156b4aca1003e47c47d6b8bbef251b5239bbf7571fd510ea4917f0e60
 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
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.31.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.31.ebuild
new file mode 100644
index 000000000000..ecc98612a7de
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.31.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##*.} + 7 ))
+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}
+
+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
+}