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

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

commit:     b58d6db7db45332e7abbeb02c2168815e711020b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 18:11:45 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 18:17:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58d6db7

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0f5a2c8e5f11..e3a7696169b8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.12-16.base.tar.xz 1027208 BLAKE2B 2b1afff6deacca3df2b83a04a104
 DIST genpatches-6.12-16.extras.tar.xz 4056 BLAKE2B 268700eac9cc0e309e30140397211d9fe614edb3c9a1208d8e05d5eff07f959ceee6ec7c68b8331df601f5ab1d81ab04bb7054513fed02a027e02b7c31e02207 SHA512 7fb9d6b03236370370528d28f4b4dea0cc132ba839ccbae80e31fc4c532f85acc2cd56e8a0a9f27ac7ed3497721f69d3ccba0c338be7e1d38588229202b3e456
 DIST genpatches-6.12-19.base.tar.xz 1138892 BLAKE2B d2869a9b38ce1ea0dea73a229f929c7e63f2cf1da904d070bf9623eab293e40d4af3d9ebd5c3b2fc5a2cf5f4756dfc889ccb62e49ef84c9fe31c6d2b4b48fc1b SHA512 243d81b3e8ba636ef57229dbbde5d976c1ac44475349cd93f1892e696a6e22eb4e7143c278618c0e5ce865af37a8c21e8a6b8d38f3f6839153645d3f88856ca6
 DIST genpatches-6.12-19.extras.tar.xz 4056 BLAKE2B 444749865813cd1929f307e8c865dc0a08b47d4a47ab2a326425343ecf3c448ff2732099013c2e80ed7120d1b0ca9542f4924dca38e084b9b2e0e6fb4f5622b9 SHA512 4d7e0ce29fa72dcd7f7ecbad844c94e5d711249f4437d3911eaca901d422c129c987166fa4d63cf52787ebba77b777f552bbdca283b8431bf0e692af3448a5bd
+DIST genpatches-6.12-20.base.tar.xz 1202448 BLAKE2B 29d739ca47c15374e039c5ca76017dca7ff4da352bd161127c0fa1d2d9faae002a99d284b3dcc94cc6357e3df9f43d4637fe172948709a2a6829df836edae0d3 SHA512 47e5e47d11ce176d3cb22e51641b2987d8b3aff62fc12546f3336c939108da5fbd66f1d2dee0b0d932b896666e504b8449bc988c34bca8620e3b185322db0106
+DIST genpatches-6.12-20.extras.tar.xz 4056 BLAKE2B d4c33c87e387de3b7bda99a9b58c8b8284129e945ceebe7b3972038bfcf9ccd0b67c0136f82ca1178ea60e12861e3bec4b26bf7b3c91c36fe9ecb0520930f1c9 SHA512 af5c01cb6e4154c20cc5d3cc84c90aab8e43b616e04da2c08b0e4e86b62c9a840a02dea467bc7eba39f699457c37a8038c5e81991bc3234dbfa5cba37bdab4e2
 DIST genpatches-6.13-5.base.tar.xz 335748 BLAKE2B 167f3f37113e64882ac841e16344ff25a96e614d3a29ebb96b5a21ddf7496386ea4f2397d5a5df0e6ce1e98348934befad7cecae6e947ba94ce1551ff837043e SHA512 1b6d3777fc25d24d31ccf33edbca65b09a5b0f3f48d8af5058b4c8de7b32830bf6fcff330e64ef2b9220cd4a117cc571bc3f900b52e68d4a9277c2a7d1f1ef32
 DIST genpatches-6.13-5.extras.tar.xz 4056 BLAKE2B 452b32878514cf29e43de6103b298c41150b888bd78509e26211c7d39e6b8f23acff0f4a5c906e1b0a8cbbb939f0fc6a106085542d4f92bc1e6f2f85580df7f2 SHA512 688fbea8a74987de17fa4afa84a6f3904b39518db971d7ccea13d4fb4f6e7df8031c940e31c2297cf7b15c7d3ec49941232b8d9d352c69e8ca6233bf7b846779
 DIST genpatches-6.13-6.base.tar.xz 417180 BLAKE2B 69cafb7cb776dba4705d15c409930e7006775ecf92f7ce2be78fd2d43dcd04ee8b02fbcf4286545963fe24785bbaeada9bf20c47c45777e7cb2ad097170d82bc SHA512 eb3d03ab002ce5079beabd9fd5ad4423406fe00f1f2013989a8686ecdeb30ebcaba3df9878167ac930da85eca801762370b0538f14720d2efb8c65787dac5bbc
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.12.15-1.amd64.gpkg.tar 304271360 BLAKE2B 368946f3a675d7d2ac
 DIST gentoo-kernel-6.12.15-1.arm64.gpkg.tar 277708800 BLAKE2B 047ae0aee587c2b2cfc1ff3ad89c9b3e6e6d8147d1b05459cfc66901d183eb2d25e8375504d1b4c41296244357e93fa61aad4e7aa454f1739d06a8f2147e1bf7 SHA512 fea7f14164cdcdeac6792ee52044698f35e00dda7daf8039e16e6782a48f4ab1e6ecfdf96ca430752cde617983c93bff746c6e3081f72bb7f0ed5f9967be86ef
 DIST gentoo-kernel-6.12.15-1.ppc64le.gpkg.tar 73103360 BLAKE2B 338e503dc38ddcef0cd412df83a252ec483a4c6ab207a94f35be791530c29425d62606402166c7a98fcc98706cb0362d26cde18b48203bb233f3632dd748dfa0 SHA512 bdd6569561d00a7f9f03d39ace032f9db056f350082f0a48eac90181df5cbf4208b299623f9d295dbaac080aa978e4762022d022fec36ac569872c4474e80a69
 DIST gentoo-kernel-6.12.15-1.x86.gpkg.tar 77342720 BLAKE2B 5413d94b766d55d7b21c226c6c8421bee9e4f2cf39835ae1abc87f19d6bf35afc373c6cad3cb513d7cef3f552a903cda3e8bcc26bf8e712f224181b438c00388 SHA512 10e0848a8a710e7b2e29f87d0fd93689187b8406a38def643f1f42c0db7d8074eba00dcc41df6a796a0190f54ec4593d29a9ad15db69f899f9d0079137127af0
+DIST gentoo-kernel-6.12.16-1.amd64.gpkg.tar 304384000 BLAKE2B 5205126714ad78a4b284dbac52b2f555c28b57bbd5e1af3d1fcf093592d44aebc64484f566daf7fe8a397615b3c653f4129f4eddba78e229c136ccfd3f258415 SHA512 b4b73847fe497a05dda2c5989df06029926b6808593a22189d5d6ed8f0c8f80be734845e030d8a58fbf9cb4338dfddb181fd5759b25d7dce2b5c4731a9969c45
+DIST gentoo-kernel-6.12.16-1.arm64.gpkg.tar 277760000 BLAKE2B 65177a98b10daef43e83417961f64162359447baba3e903356840d48aba228856a53561203395de9625402f6d0a214c2333108c00e1c650a9a316083449d9887 SHA512 9d3d3fea88a4a69858f12d4296bdb159e4b3ddf1efab17d8a5633146d132a33c8f294b60e36dd9560dc29c9995784a1d5faf34b4d13c431ec558feb70ab4d3fa
+DIST gentoo-kernel-6.12.16-1.ppc64le.gpkg.tar 73113600 BLAKE2B 143339a5b0b2d0e59bcf16b961c1852f2d3816e7c97e99f59b44f67f9fcacccfe9b1ac989a4755c66281d5a687348d0b8a240d2138ffdd97898ea06db233f680 SHA512 4fad8d4c859156d6a76bc59cbfd27ff511517f950d8dd5663f9e8939be36300f92a1a773dd7e9b5ea04e8e26048b4385fb633214221939cd3bb0cc7f9fde9af2
+DIST gentoo-kernel-6.12.16-1.x86.gpkg.tar 77322240 BLAKE2B 07f4eca6f372f6744a60888f16f18cbc7d26c7698244ab6ff27ddaba21ba8ca92e9a06d048b6c41b1ce586936d816a1866a0ba230858ba48101f4d07ce1cb796 SHA512 4d149f6f2e981ea139615534bab9019530cd45da06654db5e913a350f2c6b8f8112c51f9348a8093a12670b3e9ade2a045f641ad0be948c575cfd1b096ee75c4
 DIST gentoo-kernel-6.13.3-2.amd64.gpkg.tar 305725440 BLAKE2B ee907a898b8a59001bb22fa1e9e79e3276782d2d850925945fdcb8c92473be3f00f96b87bbfd3d7fa945602b19b131b4a83ee0a6db300480bcb3e12691fc605c SHA512 09c3ca9554e89ede41579a1c01c4913455ff24019883203e31e77ea51790fb931ba0fe7d00eb6baa07bb30c638fb9b41b817979fc8ed5862c16105c782f818cc
 DIST gentoo-kernel-6.13.3-2.arm64.gpkg.tar 279480320 BLAKE2B 36c36710d724c5362492ac3610ca5d58076cf8901268c4259285106abc8d12cc901b986deb401f7329459374f13f11f0288e2994a50d55bdc0c725698bd866de SHA512 1c50734a3bb42b3a5fe7aaa049f2d7ad76a2d15f6b9bf01e9972dacafa0d317f8e2eb56ac1dc5b0d57a04babfee7a55d9cd16dfbb6e01c8eada3eeb3ebca0773
 DIST gentoo-kernel-6.13.3-2.ppc64le.gpkg.tar 73226240 BLAKE2B f8dea1b39aa2b3cd4c432147ffbc33436c13460f2358445cd4c52bf52fda3a6776381d3399fb484c408284cb20cbbab92defe82514dd0f5487ddc455f0d563a0 SHA512 823377b0b8becebd70ddb7b7bfba6b20518b97508817c69b9f9021f13d760996fdd9c062902ff38af9d9997993b97b7c36d988dfe7135194e7611f8213ba5faa

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.16.ebuild
new file mode 100644
index 000000000000..08897ff35647
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.16.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##*.} + 4 ))
+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
+}