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

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

2 files changed, 189 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6ecde273b62d..893ae3658832 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-129.base.tar.xz 6480240 BLAKE2B 4b33131d21859d29c47c54913e87
 DIST genpatches-6.1-129.extras.tar.xz 4060 BLAKE2B 494c5a4ea4fb9d1d508442a445743fdad40c7d5d6a69403ed86cc7ea70e488e9553f96db367bcaeb2639e7615ab2ebae587ac59f5e79f61b1dcd635e8b145f9a SHA512 8f96c279ff1a22ee8227fd06505d475eab7a6da06279b9a2aa850a8445da657c8ea589eb7d2fe6389cba0f25f3e797a3f7b23deb53b6a95ae4de18974461bd70
 DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B 16a87065f9bef4016c3a19cc4e4ebce8b1dca6b6a165a36f73b5e10737a6df325f2649c609e7cf6489f683c36e52626d21300acad383df486cb866a413416ff7 SHA512 fa57d9fdaedcc5ad31d685fe512cca89f1a8a8fb097001ee069efbcdb9c377000f154c3133757e19cb7d3fe79ae54d996d1720e9eb70ba117f98c935509b3617
 DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B 69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4 SHA512 33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
+DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B 6872ca3238aa7b9e811ce827260330850fd90bb3bb48abe7a06c5fd36acfff7ceca5983aff7cdc82da2396e27b908cb737ab77c5efc9603d03193473236ef634 SHA512 baae1ebc693f5eebb308d35d8e6571f5f00e95bd98e4aac9c84e6fceffd051b4699762dc5c1f1b02231126e7c4bafbb352e4aa011cfa71d9b0ba84fbfa766536
+DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e SHA512 dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
 DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B 19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84 SHA512 dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
 DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B 65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042 SHA512 728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6
 DIST genpatches-6.6-71.base.tar.xz 3745848 BLAKE2B ab33221175b500bce645d302fb32095aa15a536ba475b866c41087d963e57a713579ddde608d93a5f2ea823e7126850599b49522c8c7112cf9435fd85897805f SHA512 eecd342f586e1b594009f91fa1ac12399d90a164dbdbdb454414eeca9bd47ce04a78e0ceee28f889324ccc505112f6a3bb4cc093f88ed10a4c521869769f4e07
@@ -32,6 +34,10 @@ DIST gentoo-kernel-6.11.10-1.amd64.gpkg.tar 293836800 BLAKE2B ef9074050bfad68bef
 DIST gentoo-kernel-6.11.10-1.arm64.gpkg.tar 268933120 BLAKE2B a8ddcfc11544bce82d51efcf4bc5a4ac2fc3bf7b7d6ac7f7c628ec554c440551754f3ba554f306c1ab2532b44032c5581ad7e6e5cdf8ba9aa74e43ab3eb65706 SHA512 d9c28da3e7c7b31173feb02264d85e9638888a2c43ae0e9f98ca4f3283fa2fd3fadbf16eea1b71ca46957f48c7ea3bdfde7ee0cecc52ace91d9d89ef6b4ebbdd
 DIST gentoo-kernel-6.11.10-1.ppc64le.gpkg.tar 72847360 BLAKE2B 18a9bb4314fe95fe52a606f19e95a9ea921d440da6cee009232ae57f7a72f8b9f6d529df50cfff476fa9c94251ce69061d699ec18d5355d28f54ba4a7ab24e9d SHA512 e149abb89d4abd00d7aa9caed0731fd4131e334f4f678ce9aae494358165e0423776c1c292c9549c5d45dadabce01a2ee275f3285d6152a413a26659adaf4d3a
 DIST gentoo-kernel-6.11.10-1.x86.gpkg.tar 76503040 BLAKE2B 873d1e90fd7df593f9fbcb76114c02e4784847ab46cfa132aea95528d31d9f94d997256db1362c9e11925a7586217e600cfc109ed6093e9c9aa3ec04a601e4f7 SHA512 4945da30169963636eae7df359a59e64e19acbfb98dcc5c3c803f7c440a8e83c4207f7d8663b6b4fa23763a6e051278ad68ddd337aa9c2866cdb36ad528b942a
+DIST gentoo-kernel-6.12.1-1.amd64.gpkg.tar 298700800 BLAKE2B 0e691f266113eb87e1b1bb3fd05b51650fb8ec02569c46dc0606a94bfe101f4cb0f48d951a380b56909695f5e3733c58191a2ef2aaa681581056f1e02631f117 SHA512 3347079fd82abda68f10af3bf0ed206a735d59a0adf062bfd2ac9d6adbc141d647ace1e37e36fb0398d7b7e5caa350f777b14cbe08bab5e762b51bce38f1b856
+DIST gentoo-kernel-6.12.1-1.arm64.gpkg.tar 272773120 BLAKE2B aecd1217beef2537dc0a459e55eb9b368c9a117c7d47f1c5f3e839d84b35651c46137c04cca7173e2f69cfd84d281e5d1db4d4eed84ad72a93cf63712aa84e31 SHA512 e213ff8b0e4744f682986f377821d4af3d97d91b4d6a47ea8428bf9914ecb11721ef9a3490a8a803bf924e240c1eeee78254b11dc66d981dda22e171404b2b83
+DIST gentoo-kernel-6.12.1-1.ppc64le.gpkg.tar 73031680 BLAKE2B 0d4b88f258cba1fefe2bb6982c2a8386e4b6768e2ce79c8fda7d44e106a4c769164b9bdecfef1df6a22e560109c87dc378dd9993b3d48f9638b25bdcdc5aeed4 SHA512 94d24b9925bfe58844459360fbf7b4b982cbd55e153c5cb07caa6f725aeb35024b1fd96672a7bc2fb0886a39eb307ed621c7a09ca05bb8cb15046d913df453cf
+DIST gentoo-kernel-6.12.1-1.x86.gpkg.tar 77352960 BLAKE2B adb2f04f127644dffeca1b11892a5b021f60fc36cf322ce820682ffa83f1586c74f013258a33679ae6dcd5e5bb3095c0922b12acc0395b3aef303c3e936d5e28 SHA512 8f05cf80e92be1d2ec15aa176883db74ce0ae832c7ca3367a7f741a8185a7260d524493d6ae68fc7d95eede7ae2fef546f339ade85d53b5443dfb4b8d437ae86
 DIST gentoo-kernel-6.6.62-1.amd64.gpkg.tar 266598400 BLAKE2B f02bf7a4a53b025a1c2da579f73f3b0222e0c1b06deb3657b39e70103bf2ff0ef5e56386b70ae70a0d6822f41626e574f620e1901d46a752c3d3cfdffac70318 SHA512 8a62586c680c0d0dfd3f498dca24292ef337797adb15aa200f2964cc37624cb2dfb537ddf42036640ff46237749d1313f1a8724169a78ed958f2e99f5d530ddc
 DIST gentoo-kernel-6.6.62-1.arm64.gpkg.tar 241633280 BLAKE2B 67f10267c5f7bbbd436c7fa44f1f0e9dac83262f58c3b297a681d8769c1d0577123b4cc3c45283aaf94eb3dc14189c90207d0415ea174737f7eec12688bf1f4e SHA512 6933a49baa988b84171cb4a6a1849c1f115cae4d09715f2d450fed9a8e2808a1c86b4af67545554ad91992d77eb06196ce1b395f6749f9547e01bd63f157a827
 DIST gentoo-kernel-6.6.62-1.ppc64le.gpkg.tar 64327680 BLAKE2B 7bb24f2f5d97446baaf70f15ad2f8437057274f371569caa7dda12c0e31de8be168422623d685609c37ef532b8b67dbc6c90aecbc561e7e86c66ca46945962bb SHA512 4936c616f77f1bd1a728778722207d298e7c596cfc4e35c0f3ce703ae4282e7ccce274762183a81cfa2feaadb456d4467a87a87c191abb3c72d3da5a498cb297
@@ -44,4 +50,5 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
+DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.1.ebuild
new file mode 100644
index 000000000000..e264bcf1bcc9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.1.ebuild
@@ -0,0 +1,182 @@
+# 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"
+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 rel_kernel_dir=/usr/src/linux-${KPV}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	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}${rel_kernel_dir}"/ || 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
+}