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

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

commit:     9d60fca4917e8b336862d67b7f21c447e27ec4bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 17:32:54 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 18:04:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d60fca4

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 678fe6145dc9..f4d150da4d20 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B 818643d9f5ec5f4edc3cf2360f75
 DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B 2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1 SHA512 d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92
 DIST genpatches-6.12-26.base.tar.xz 1534560 BLAKE2B ab84c4f747924c39727b9340bb1974df4c547891e7551685bca0b85c65318f146bbedc44e7b66c56154d0aa64d50f3918f96e5eec84ff40201a52edd99414e41 SHA512 34bf25e6c0b706dfb8848d69969ad10c2532d2c5ee3e24e6ec9b11f3e347624dd6e9e129e77596c2971ede310ec8f2e743d3a4793e4b42ed1651e14f963e78a4
 DIST genpatches-6.12-26.extras.tar.xz 4056 BLAKE2B 3577c7e25edc04baf51a2ec2d36394b5d42d04f3749802d2e3a7dcb57c14aac8217dc243a93232d639a8758b71671e3134c8c1e2f8daa7f6770e40851d7fe0e9 SHA512 2d9581bd5fad5ac13189409c0c5512320c5b5897359d49a044beab3e47c37d027f12c196ff98175f10dab26523d778fa01ebbfaa60c6b8a99e31355864e0f0e8
+DIST genpatches-6.12-27.base.tar.xz 1638184 BLAKE2B 9a0597a4a2d2a8ed3233216e2c926f6ec13810638d6cbd429e193676ad11acb340866496c6b2d492203241da1c54b252ef0f866725e704aae51fe26ffa55bfa7 SHA512 4e00921422e6d28940d3bbfb32d3f41b9f0a02f4e0367fbf4cf55634009326fc1755c5bddb53ae8c20c5161cf0950f71be637490315a24b40b472f364d7e76ed
+DIST genpatches-6.12-27.extras.tar.xz 4056 BLAKE2B 11700c29ff308a39c89ea581f7523e90e4041f64607f2db8bc98a3652a34456dd6e32fe821d0e4f2639d390eaa06d4db61fa8526a719948626fce6bd1667885a SHA512 badf2c1beddc71da479d507c211a6fe4ecbb03caa511f2be013b319d0c27b63f8dfcc79ea2a4aa9960c0cb25caf9a8a126980c078bb4c862c37787b9c9eccae0
 DIST genpatches-6.13-11.base.tar.xz 696060 BLAKE2B 1d90850c681688f299e6d66c6ab2a9f3d9a45ec516d2b727adb9dd7c71d33c452303190e2e0e3b2e5bbd779b1be22683d70e53e84324f1c3c545d942ff15fc44 SHA512 453db7b734144101cd3096fd1d0880700816ff1b8bf60b71436ac51eada5af8c74329ee288b302b5850231002bab5b8c3a737d4908ac09d05e32e9a5fb752603
 DIST genpatches-6.13-11.extras.tar.xz 4052 BLAKE2B a40b3c65ed30aa17797727e8df0efc37ea23639c965fe8acaa17f9315029ecf7603071f74d96a1623bc84f4d6d80f62f5119f85e714f32403bac6b300304a7d9 SHA512 a5953975b5e88bef1a8e8aa73f343343816db4e6731d5376dba6a3cc65e15b19e00e38817b5a5dfc5374ab9138ec1416a1d14143cdd41a52ba284ba506896bf3
 DIST genpatches-6.13-12.base.tar.xz 703484 BLAKE2B 5b00c4e4f5791de684731bee535312f42c9f7a0ffb57c25c262025542b5380e6c55877526ac71c5d1293831d69f84a74a65c8df47eedfc14b91f166b51d0ddb7 SHA512 cca66b71c217cee7b2723a63e2085fa5e041ed8a226e9563704016e37fb46221a941cea22581652bdeab2333ebe74e6858232283e3071240a9587eb86adc7e1a
@@ -72,6 +74,10 @@ DIST gentoo-kernel-6.12.22-1.amd64.gpkg.tar 304926720 BLAKE2B b010a6c341c70da15e
 DIST gentoo-kernel-6.12.22-1.arm64.gpkg.tar 278046720 BLAKE2B 8e97731f8c50437efae706fdbc53aa109f154ae1f5b09752348dd0e0a694f5b4726fa616db65a76cf1e08f9140c4beb3e176cd80133d260544d585c691391f35 SHA512 735a590324e7dde3a397bf1db8f042b14abbe30d929a31f786c4141a58beb8c31365c5cd3b6538067b8e2f7daee937bc917451246a0fe14022281b1611cc3a3a
 DIST gentoo-kernel-6.12.22-1.ppc64le.gpkg.tar 73134080 BLAKE2B d5371cf76c25810c7aed74b905c8b5bd595376cf9614b7e9391352815b893cf1c13d5d94854cf6f8a1086b1f506e7ef385e690cc08ce6f27c57d4974ea4de945 SHA512 ddb59c6f37fedad2105032c0b48d138a0e6a5ad2cd21ee2be7a492f465adcedb114caa01779fd0d57af22be54d85282858f1047b5aeead8f891b5f74d8a28a79
 DIST gentoo-kernel-6.12.22-1.x86.gpkg.tar 77434880 BLAKE2B 60d68a4430a0ef955023484b6da7dc7da099a05b0184097cdcc5792d30297f9462f26e33d77faaf78ebd005612b66da9387f33f3c3f5c08dc63095933c030f11 SHA512 48d040c627702a4cbda51af56361ae430d82c72c0894aa418c683a8a781112f69440a1b218321334d1ec2c68977f7976c845f42febb67394cf51da9370c6ff7a
+DIST gentoo-kernel-6.12.23-1.amd64.gpkg.tar 306063360 BLAKE2B 96da93d1e61979f7ddc3b0c2d746e90debed2cf4702529c0053e22d8afd1a9518ac4c7fdb06ee6f370ab2397f0cf227ba2cd1bb617b09a649e6632d446065388 SHA512 217c8f96dcea38b8f895d9412d087f91e18098f87b870f25a1a746066f2676acb5058823be5c578ec8cefb24d348026bac83bc97498c81850e10f5dd25ccaa19
+DIST gentoo-kernel-6.12.23-1.arm64.gpkg.tar 279214080 BLAKE2B 03f3b47e25281af81a4df4390f42aaa1f889fa9c00f1b6308ead4b728119c03b41a06cd0b1ff0a99a92d6b3202c760d752a392204b772659c749cd43b6615da2 SHA512 1455de7b6da439f59587bd1de1b9fea2e415110d68b9bb3da7ffb679fc99f401ff4c916a41624209c9632173e6b150d4f2b7b5ced713735863abe73d73273498
+DIST gentoo-kernel-6.12.23-1.ppc64le.gpkg.tar 73246720 BLAKE2B d27169673d18a6cb2394404338a37ea2fa38aa568e4fab8ea2182040078701e7576475305482ee5e93ce4b9870d28a7af913fda817d1038ecf806c7f01dcbb75 SHA512 fd9c27e1f1a4081686635b8c9b4a9491b0a00f0553b9fd140a4af36580849a946a2e3ac4ad6b1182719887ddcf3aa10d523610b881f694bf86e4efac10ca9596
+DIST gentoo-kernel-6.12.23-1.x86.gpkg.tar 77598720 BLAKE2B 934d32e9293db2caae6caf42896a8bf6e0239a20cb19b77b654837cc89ca8b47d1ff9997f68badfda26c59729f70151308980c1b462464c238ffd9b1e381357e SHA512 a011e9376eb9427d675e9e0a78bfdd5faea13698512f7fc383b8b4c130bc7ecd1fd833f83d929f1a8aa2fb7984f4eee3301cef4320193a80aea46419cfe8cc8b
 DIST gentoo-kernel-6.13.10-1.amd64.gpkg.tar 307619840 BLAKE2B 0e56565f1722db409ba212ad6d508ead2858ef5a9d0555c0b0dc72095a13a86c32e8e1d8267b93d1b385d00b27aa4c504b5f80cc2c0d95eba542ff07b72ca67e SHA512 6eec123ec7acf18f9dc23c1606bc11974e2148a764d0bc77d5309b5d8d9903d102421312dcd20a19c874b780d18b05b6264eca61881311af4b287b81f29143e6
 DIST gentoo-kernel-6.13.10-1.arm64.gpkg.tar 279797760 BLAKE2B b55f3fa7e2dd2f6c1f5d7930a1decb622b147169ade8511c15b5cdf7c4f7405dfecc33825c49fc5d639bf6e4fd7cf443d48243a4a5f841999d9e4a3efd0f54ac SHA512 ae0cb20311a86cb008d6775e3ccf91d80cb1f9620447f9150ec7a9dd13cd94d09417de295ff4ea206bcf4ce3850cb31282bd1240b9ae59a68ee4c1f95087f491
 DIST gentoo-kernel-6.13.10-1.ppc64le.gpkg.tar 73809920 BLAKE2B bf3d1973d6d8d80096de04e5cbe56efb6b40ece400c3ea5afb01c86c2f688c722f21ba7d4b2ee6cc4a3f6cb3df6c90f1d6a4f7b5bad029b39bd5ce0e88d2989f SHA512 f03bb0dcf02405ab612a6e9370c6a79032536d70f190bd511365fad50017ca2810ce540db9a67f20461bb2b1d3fb143b32909db07221ad4f388de0c3d1d1d6a6

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