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

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

2 files changed, 187 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 457d7ca622c4..ddb8b9011102 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.6-67.base.tar.xz 3647888 BLAKE2B bbbefd68b7d6ade81dd81f600717a
 DIST genpatches-6.6-67.extras.tar.xz 4056 BLAKE2B b8240a27f81aadce548d5c94cef31531ac5e5c42cfcae790cc54c9bb6c8ea7c7175dcd9eb81f0844d31efcf3728f68b5bbdb630de5ea025b25fc2a37c64d73fe SHA512 5458a8cfa22fba5ef27fd1b46c1a31f16e1a9e0b36897694c3a46c2273101bd7be56dde90b3c4cc2f75eb02383f518bf5974b9c446a4ffd3fecf707e935748e8
 DIST genpatches-6.6-68.base.tar.xz 3686816 BLAKE2B 56331bbfcfab2851304dc8263025d66e7efeab1bbc4f4a4a3969e08cf239a90f4e9fcbd381ea55db94682e8e45e6f2e73748f50eac44ad65dcf50e3b1feae75f SHA512 29b269918f54b72c4ac54a3a80d9e2cde64fc281ee6ad236be3d44e7da8ec58d9a1aa9c1d94c02cc88d28456cd9e4128bf15a381b95402f32226af9669876cb7
 DIST genpatches-6.6-68.extras.tar.xz 4056 BLAKE2B 61235851cf180cc5a8e17720907cfcad6bf993ce2387e3ec4012ddd8a23e24d28b02ab2dddaf1a95125c92b31294655f294a7f3b1b5fb6b8597b02959f047126 SHA512 4065216d3251c0af7bd7471667e8cd17a62d9f9f7a1f06a208cb7ccbf65160ee0d6a98088f872555ba9ecb8403355eed80a0ae6b20aa4326b1f43e876edd85ba
+DIST genpatches-6.6-69.base.tar.xz 3711268 BLAKE2B 90b1f63e88059b3a7bf2b934e7bab30b68c71bd3991f749031090f295ec62a43dadc6d44dc2938608d771b3052f3b6d93e76af4a8007c0d52ecf6b50577a8486 SHA512 00c2a2a01f7680ed25a3372c62cd0042de78c48574bc00655f9774051a4704193f030ade5503376395367f34649b018a7894a8f4f8ff67f3bcb19b92e55b8023
+DIST genpatches-6.6-69.extras.tar.xz 4060 BLAKE2B f519a90411e0446558cee950fc359b3e11dbd08e9624f4345880d96ad6c0384b0be21603c01eaa5340a9e37e10c1c1f516d42cbf756afc759d4787b952590ff3 SHA512 c21cfd363be608778206e5fa1d41765825336e821b22b58e0bb9a8d84f9795f2d78d12cc9e008aa5d809788d9389689e3045faefe3191e1fb98393a27007006a
 DIST gentoo-kernel-5.10.228-1.amd64.gpkg.tar 63313920 BLAKE2B 2f18168a59a42f434fc1c0d89e4082833916c270524da29726a14ac81ddfdbe034dac693b71aadcb76d5670387c3c3c337543c9732a158836eac2a3c403daa9e SHA512 cb90cc8932fd1be6e084b6c554eec2a755b5b99cce7dd1dba76a7ad71ea90a89203bf0dd8e314fd50bdcfc79df04e22639d58f09b5097845fe7d7900baab510a
 DIST gentoo-kernel-5.10.228-1.arm64.gpkg.tar 56760320 BLAKE2B a1826c8fac94c3ac7eb6f5f71e6daf5bd252eb09ac6d56dde19d382036a68b4b83897ef9e7d88008ea88fb1949dc2e49c3d58a676241355f7f8118b6229a4447 SHA512 19e4e68593240e0f253c87b4c1c48d815f6715762322fd6bfa6b4fa8220b61bb7165c089385a75f0507ad99222cf4b7d93f3ccb29d27e7729d19c934722ea7f2
 DIST gentoo-kernel-5.10.228-1.ppc64le.gpkg.tar 52776960 BLAKE2B ab5193491160aeaa4aa90c5fa9ac41b3eb8878a5022da78037e5b510635b64acbbdf3ce6c3739cd1db50a935f314af10269638198a1b292e1d3f3031e0f9e3e3 SHA512 78106febb98e131cfad5bbf6c7aa9a2edae627d55ca9e09bdef11af3306cc952e9cf190bc2ae19435e5f10854e276a0fec18b7bbfe95fdc2da198b92d5424d61
@@ -94,6 +96,10 @@ DIST gentoo-kernel-6.6.60-1.amd64.gpkg.tar 264560640 BLAKE2B 3db17a3b6c7b39253db
 DIST gentoo-kernel-6.6.60-1.arm64.gpkg.tar 241623040 BLAKE2B 1ccd6db504cf211ff90bea7c684409a5e9fbc8610d617a032759971a89acb6b002749a4af8893ab837acca9176e92ce700382340e9322d108a89a990b7bcb8e6 SHA512 14fd64094326a345c7e719fdb47c0472ebdbd71951dc01bd1a8b8fc1df84e7a950a078beeb23b40d8d4a0fd67ba564698ca915e7b90df7db5a96afd3b62154f8
 DIST gentoo-kernel-6.6.60-1.ppc64le.gpkg.tar 64327680 BLAKE2B 88bde51ef8247b2148b211e5048384f6c5c6af297d08d95dcf597ea6c94f9f654e5ec0cecf2289fcebd82635b9aa7c3b5329cc778692cebc8d1efc55248ee29c SHA512 d4bf58bd328ed881ec5df713f7ca003f2fa3ff9d7d3e2c42c7d71d723b99b33b1f25d1dc9a7342ba572596f25f01c375a483b1521ae883f0ee9d5a97a01ce4e2
 DIST gentoo-kernel-6.6.60-1.x86.gpkg.tar 68331520 BLAKE2B 2e3078d1fd08e7b8c4d21d2f465e7bd048176a97b23396b04da65b9388d1a6ee3223fcbbde87e866596546dd7ac60d1915fb0d70aa29ff15ce0663a15c109c7b SHA512 07f027490f45e770e2739577b42a521d61b43fa3b48cc8f7822440f1c59e18278ba7e506f6d88e953c9cea74150414e17a78e7397a87db7eba08060bfc00494e
+DIST gentoo-kernel-6.6.61-1.amd64.gpkg.tar 266536960 BLAKE2B a318d5d2ff7dfaae0fc18138233fa65b356f515a770c0f255268fa81c9936a48f15f76e56c2ae910048ce4a00b4a6191f06ebc8cccfce41e86290008f88c1b62 SHA512 70ceb38fdb3b5936663b3beb82e7eb7855054aee619bdc60b24f97712fdea02611d7c310f24eb5b25e456ff4d83ca8535776eb2f4ef9a206a5dc19b219f62818
+DIST gentoo-kernel-6.6.61-1.arm64.gpkg.tar 241664000 BLAKE2B 45d3f26a317d55a0996faf9a38a90015aabc009998fa62087b6915f414881f1b0f2d79cc237084f35af170ff4d113cc70909a1223d29c9201cc03acef9569a96 SHA512 244557464edfa86a71e167b30bc3feda90a5423a2cec11b72ea438d55fe46592e60dd325691c6d58826789caa0e73c70d3248b05d06d535d137b2d96b3551a6f
+DIST gentoo-kernel-6.6.61-1.ppc64le.gpkg.tar 64337920 BLAKE2B a32031fa9a49bdd3b224851d0bb1f04aa8bb7601d4aba29c1df734c7f40ac2b2c1f6cc55617414608c77a0fd2e25b7f1bb044b2959f210b74eba8cee6fe663b1 SHA512 2b99837031adfe3a34d02096035a50ad667aef1c1f1d0865c27483e55a03b0e29e7edaa4374b9f5481afabe4946b64146646ff042b052f89fbbb1e8a6b1a84eb
+DIST gentoo-kernel-6.6.61-1.x86.gpkg.tar 68352000 BLAKE2B 5a9e6f2febaa3f603a78876602536ae3fff9bcc76f980445f4c3fe32e07a58ded718dc62264dbfd711526d676272c486d3d1b5b2f51feb46a6fcafcb02edad0d SHA512 1a1dda0593b14f733657bbf90afbb6f110451d0ebb7cfa972ba44428b32796eb37bbb9e09a66cdb2cc93e40319d4411426bdc4778b67fb48f3624adfaeaeabc3
 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.6.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.61.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.61.ebuild
@@ -0,0 +1,181 @@
+# 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##*.} + 8 ))
+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"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	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 HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	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)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		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)"
+		READELF="$(tc-getREADELF)"
+
+		# 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
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	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
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}