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

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

commit:     e5e7ad25f71adc9f8d5bd373de0e2f0a50a52e6f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 18:02:06 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 18:09:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e7ad25

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.12.10.ebuild               | 184 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 73ef0616d2ba..6d06336822da 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.12-11.base.tar.xz 711536 BLAKE2B a9911cbb7cca5e6f3b06adba52289
 DIST genpatches-6.12-11.extras.tar.xz 4056 BLAKE2B f8c2a145a06ea061100ba4d16e873a3186c4025d48610180aed135a8802494855decd8a58c24ffa4dd394cac843e41f45dd8aa93c28e03cdb1d46d8ce496da17 SHA512 e2808c8a70aaf3ef76348542a0aa0656f1ccdbe3523b22e5539d0c3952b4013aafddca5d881bc0458aab33f1b652f178d89ae4e596a9f541274f74eaf97ad16b
 DIST genpatches-6.12-12.base.tar.xz 758168 BLAKE2B 2f9fca909ebc5710fa9154fe4c824116e48adbf9d4e857a75661b0689a0c44add897a502700edf415ba4b664fe586ba490f16b4dd12f00b19b80c34800d4b6be SHA512 c7d125caa03b0ff053f37fc82a4fbd9d3be8f8eee024bf05639d4f3c3b51574983e5d0beadb7714865f6d72e02a22ceb528c8359115ac995b63f5d87eb055bb9
 DIST genpatches-6.12-12.extras.tar.xz 4056 BLAKE2B 8e00efcd3af7862fb8bde9d8a2e9d51fd999474e33e63e058c3580b187abc71c2206663d37b7b4ebd96193c6185a29f5d1e9e9ef98167703f01bc5c3c9b767c7 SHA512 a52dec8d607e64c112a2b1c731f65ca3fe340712bb390c25e8f7bee90cabea619922540998ef6b95b97dc0626b4dfe3a9713a3f8e7efa8f99f3ebd95e8fdf855
+DIST genpatches-6.12-13.base.tar.xz 806528 BLAKE2B 0eec1195d5a497e64556d992893f251a54c558151aef1fc1d03de0b95bdbe03588ef486875e7676f9635da62e975dd8509279ed2d96b4dcb3796e1d8a4bb3768 SHA512 3cf8549679aae42fe56a25c0f9d5eb5c59fb867c77dc22c21446064e55d91276ec75f60f5737ab9a39c82dd0e74ab1ee3bd62b5a78f7448827b5577257976aed
+DIST genpatches-6.12-13.extras.tar.xz 4056 BLAKE2B af48fba5d81bf8e13658555d94fa131e3f8fa06144148dd11b58823f802c5c4aea823fc4cd8f308ba6518638b65637d0b8a030d513d4b2a05384fc8f40550d94 SHA512 d7b1290d44696284fde4980ad3b90a190659056739a084ae704d1edf1a06ee166fa78960a42999b9e6e2d8aad4fd330621c8865f5e2517f1453c916d6375a365
 DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
 DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B 643510f5f01b8b7ac5c24098cd65b21ef02fd75b2682b371b00e8be48c6c335e7135569c58ad91ab6549e298b1dca15b83806143bf260a9e594feeffb2178fc5 SHA512 1345c21e33f3f0433691e03921c7b3d47bfdaad47376c06610170cf82214e3648cbbd2cb250ea4877d5c238f324f499b52e50dd2e5b51b4e336f2a1a5a431a1e
@@ -72,6 +74,10 @@ DIST gentoo-kernel-6.1.125-1.amd64.gpkg.tar 73000960 BLAKE2B 34049964226c50f2023
 DIST gentoo-kernel-6.1.125-1.arm64.gpkg.tar 65730560 BLAKE2B 56801e6c6ffb5e669f1fbf8d9d95f1f2a49be58bdb2f38dd056ff2ff02d494e7e2e43d6e493d72f8100a43f0c11cb8f074822c319754823042ff4a675263e9db SHA512 5b87abab148597cbeed43988e52abc2f99f53dab405d955676e765aa4f470144bd4b38ffe730673a925f727a9d0839d7afdcafd4fc8fd5761f8db231d25f4600
 DIST gentoo-kernel-6.1.125-1.ppc64le.gpkg.tar 59924480 BLAKE2B 2334fb4c12cf7d4cf11fe4b3bb58d8aa11af9004fd97d87e1b5dab83b3d11557a1b2834b7c8659cf907c050b3e5fe9ea5c4197d54a3f8a48bbb8907f40ed3e70 SHA512 bdf805232cf12e8625a8f5874e6bc374fa2de711de4582ecab3c668bc1f9258f51b77a9ac8cb6aa55429046a719376325bfb40ed302c465ef7b0514046be8b88
 DIST gentoo-kernel-6.1.125-1.x86.gpkg.tar 62382080 BLAKE2B 744a5555991612eb784a1f906b0499dfb2428d9e0304ebe282c6627b03563e5ccfe40c47212f792f56b134a1ec10acf00f1ac40c8fa1b4771e2598eb75ecb57e SHA512 351a9c1d9ca07effdafb82e62f3bae004d2d1342c58cec65c97351f9363f478c8288570c0f4bf77252a2d0fc063cb1ddd6c347cf7cc80855afa48cdaacb5bb02
+DIST gentoo-kernel-6.12.10-1.amd64.gpkg.tar 301516800 BLAKE2B 44bf837abfd4165d0d6a01e08fcea264c3579e5d4f41dda716049fc8ab9905b748b0216b858ad6952a9ffa7574cdbcbaf054c11ac150af21cbacb2d7e82b1019 SHA512 119f4e51d7bba1f146d7bd7ed6e992e688c6eedfeecbc066af9d9af960111df9f0e517fd8e6503784cefed4e8ac53951785071dd401938dc0e976aa6b9babe00
+DIST gentoo-kernel-6.12.10-1.arm64.gpkg.tar 277606400 BLAKE2B e60b300544e8b5bd26207792c2ccf3630035cdfbc6c93296c83f40b19123ef1161dd7f68256a4f1f8b598e0898a736ee499e0cb8c5f314d95da57b44f76ee8ba SHA512 d4a535644955d8a508c28ed1ef293811261cd422dcbe54b18511de2c2ec05e2ef1c06202582f37060fd577a608af47370dbbbb8743528ab1a3bf4f391582d735
+DIST gentoo-kernel-6.12.10-1.ppc64le.gpkg.tar 73103360 BLAKE2B 2563681d420ac7f700c9bc59aa040303405ed0494f845047c8efe8751b26783394ace15f0c32e85e337d998cdde91fc3a7018f739642d6dc3dac8efd22a7e21e SHA512 557decc01e9979c1927823f05bb94cab78b2ec4eab2daf092e9d6cbbca63018343aa5c998197bdbf1149fcac79512d5d9f1b89e1da19607749a9984811cb5eb5
+DIST gentoo-kernel-6.12.10-1.x86.gpkg.tar 77393920 BLAKE2B 1b25c988d32151ff556bde8e69636bda8193f4cfba2b4abd82b104e168d540e060ed0dffcc875c96b7315bf5b280c9bfee929ce74aa6f513dd76e17d0e346d85 SHA512 ad30aef0b07286eda8e6adbc683a50f5e19a3c5a6795d6ea94e702096a2924b04d318785bef33c5a8aee48a7316cc8262cb5734e33c5f9633d86a08570e602ef
 DIST gentoo-kernel-6.12.7-1.amd64.gpkg.tar 298915840 BLAKE2B c4af62bc39de09dd063495bf6d5cca7efd8364b49b797bf90a89af4a049e255ebf3ad6406df4fdc1645e75eb4778f9cc4029b63c343b469b1129a33579c2f598 SHA512 7ae48ee72fbe878f408b753ad97b60cf0c46ee80f098835acfae5cefbb81a4c349945bcdbaa70df9962b8827732a244ee795d1e11d35e5b3d255532057bffde0
 DIST gentoo-kernel-6.12.7-1.arm64.gpkg.tar 272957440 BLAKE2B 0b912595630b087c7e1edfdb91798f2514d2b20869fe526f5e1b759ae6a02156050a435037ef58583049a41d9d392a7618f935d36d0bd11570bc588b5f9b6329 SHA512 0e420669ba619d67e65f6a477f36420fa924341819b31f047ae6d707c43b3f5c955c63faf37b48754dbf852e50c5049b19f0a5cf4e7bbbc4beb4895cf67d9e69
 DIST gentoo-kernel-6.12.7-1.ppc64le.gpkg.tar 73072640 BLAKE2B d9914726e39a58047931ff6ad75e79e6b1c5307a32da26e0d3a5b0235d94c15dd3489bd7b586eda0fc4c73512f8f429bdb700494dc5cc3675dd0b3ce4d51aec4 SHA512 a82245ba62d8779546e5c51f1900aaaabaf7f01fb0ff74f0c6a2754b56724c554268e82254ccd6ee87705dd32a076365075211e61afab38c278d017b3d57fab6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.10.ebuild
new file mode 100644
index 000000000000..8431fd7c468e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.10.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020-2025 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}.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
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+}