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

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

commit:     717d806f13f378bb27a1a0c102d067dfac4c2767
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 19:37:55 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 20:05:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717d806f

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.12.9.ebuild                | 182 +++++++++++++++++++++
 2 files changed, 188 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index cafe9eb2ccbd..d9bd18e28433 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e06
 DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5
 DIST genpatches-6.12-11.base.tar.xz 711536 BLAKE2B a9911cbb7cca5e6f3b06adba52289957eaccbdef25aa1d1f610ac7d7fde2a1cce46095e3d48b281a9ff0a9e88559a492833f0f39cf151ba560d6f3ff8fa5a4b3 SHA512 d33a54716e726cc8d19b366a7ad1cc51822eba4fa329eda596e6e7dbd851a9725db4e5f4bb827f36a26604b7c0b5a60154a2310f99b18265fb3c68251420fc1c
 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.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
@@ -68,6 +70,10 @@ DIST gentoo-kernel-6.12.8-1.amd64.gpkg.tar 301516800 BLAKE2B 4b35b8ad169c3c97f4c
 DIST gentoo-kernel-6.12.8-1.arm64.gpkg.tar 277544960 BLAKE2B 82bf907f31c7ee3e036e5fa91c903d2a716b968169f04cf5b5cb014995d784f819bd9b6630530445d41b2293ffa5b3cd5d1c3b11274dfacb0872508ba431fa2c SHA512 94f9ea5ab97e40e578df3282ed3202b2d2cd48928a2a9c7840366c604d8d4822e0a28c349a74e1f759bf07ffdb46caa58bf6a8f1ee5a94578e70129083328bc6
 DIST gentoo-kernel-6.12.8-1.ppc64le.gpkg.tar 73082880 BLAKE2B 65857a7613d5c7187f85395b3ffe88af25cdf8fe8152e516362a8aae8f910152bd7d11b0316eb0efc13a01efbe47ca955cd5511bce4a95a1bbe41091b6ae5e0b SHA512 ec54b65278415ad95cb899217022b911a716468757fc8ea454e5a8879f837b283b691f30dc4ac329915643f17d275ee421df284cc46a06e068f51b6c48682625
 DIST gentoo-kernel-6.12.8-1.x86.gpkg.tar 77383680 BLAKE2B 7c855a13851db6e50dcd59a2ec79f43781f78fbf493a63c682f1b8707cb120bea9ab6e6ef6c181256fc5aaf150bdacd65e1ea17e200506290af8bb0d8393d468 SHA512 be64b12113d762978558ecce5fd5777ea29ff8b3052f63b865c0c5d1ed57d0f08902c96f03b5f31a59c0105d233d720706b31ae0c91c8eb9cbffafc317c00c00
+DIST gentoo-kernel-6.12.9-1.amd64.gpkg.tar 301568000 BLAKE2B bc1522fc4b151e9d76a001698a44da923c988587bbbb342dbf8b231af742eb8c5c3da79f9f71ccce5a94c371d0079bf6fcb93647de8b6634b38803641488948f SHA512 d5c478821f3d18704637fa166340a39ee854a545575f5b990529b2ccee89bed6da19b9d51a3b0ff3183d9c31e780333635db2c3874c1e4530f505ae8632b397c
+DIST gentoo-kernel-6.12.9-1.arm64.gpkg.tar 277596160 BLAKE2B 68da94dd39d92a54ed1dc91d547d28a886c4e8e95171d1d50a8ada3abfe7b504fcbde0bc93174c5d72e5af08a9ea6d5f3f1882a6913880c4b80b5fc86c55dc14 SHA512 d3d4e487d2c03e86ccd060c6cae68f92caec53d44ffd2efb336fda5627d9ee485d3832878af0a173044f811c41018b445187c34f41a0132c4694c736c5b6e601
+DIST gentoo-kernel-6.12.9-1.ppc64le.gpkg.tar 73082880 BLAKE2B 494c5edb61300c2c9a53997d5115a01e704db1850a2fdd473a64676eed4237abae55070dbbd332513a5b8650754806e8ec8abc1283d9977847f216c404911b1f SHA512 24c6e132d552530ccf9c416883ee631439cd6f317d8541c9a95f5b1b622b71a0298ca169c8f3dd56fe3a0e636cab33861d3f769ca63abdda8ec28d79ff7bb15d
+DIST gentoo-kernel-6.12.9-1.x86.gpkg.tar 77393920 BLAKE2B 73c7bdbbd09b402856646414b0ba98c8e825e35f1e318d2ba361d652dd25c866bd2c3f9040b8f072c27bb58ebe9d0ccfce723a663dc11b46b98b5c8a094dfbea SHA512 aa9b7ef2ad1562869255842369aadce6028b787008046e9c97594de5f9c9277dfe3497b6bec5b1048df256a59a52b493b58b0d20f91d1195b54c5bc5e756f28b
 DIST gentoo-kernel-6.6.67-1.amd64.gpkg.tar 267724800 BLAKE2B c38c7d1a3f3cf59afc345f1259311433a2086764bf7919051894cca8d442b5d2cbc74016ac4474b11d8855f760e09099d86bc5d31ede56e9e2ddbcfe139bd9c2 SHA512 c86849c88b3ebd4be4ab111876916896b02140bf267a1c071a5db845aab917d1bfce310da2dfd8a7830146963751735a8fff71e6513d513b282ddd57cba2a37f
 DIST gentoo-kernel-6.6.67-1.arm64.gpkg.tar 242319360 BLAKE2B df01eddbaf3d31b91b87bad4372ebf8f46a5a27bd0646593c9a7961b95561479dec4950c25e5a4cbcea4ea1e2be895a7f95d383f87593d7a4fc65f3cdd0fef3a SHA512 6067d6649e7e5253142b5416ddf8daf3087552f33895d2bf273cae7fbbfae26689c7d02231df6926d35caf3e8dc941aac28031f044cd9bba93f7349ac7874575
 DIST gentoo-kernel-6.6.67-1.ppc64le.gpkg.tar 64399360 BLAKE2B 12f72a9b32eaede365570266c84a0342bff045d599952797c902dcd8f0cc22bd64e89b3f89f29945f2c8f10a88f802e7bfa5988cdd42160a5b61131923a792fa SHA512 44ec739e47cfdc56c452b12182953942940edfcda069af413d21b51ca93b2f45712e949af9e24b336743ee0b55db9d658856df8e59aa9bb348075a342848452a

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild
new file mode 100644
index 000000000000..f35401be6b63
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild
@@ -0,0 +1,182 @@
+# 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
+"
+
+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
+}