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

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

commit:     f259e1becd89c2b777a7d058d10c50fe17a2b5c8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 08:52:41 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 08:58:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f259e1be

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6ffe9f4b6970..15ee4372f978 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.12-20.base.tar.xz 1202448 BLAKE2B 29d739ca47c15374e039c5ca7601
 DIST genpatches-6.12-20.extras.tar.xz 4056 BLAKE2B d4c33c87e387de3b7bda99a9b58c8b8284129e945ceebe7b3972038bfcf9ccd0b67c0136f82ca1178ea60e12861e3bec4b26bf7b3c91c36fe9ecb0520930f1c9 SHA512 af5c01cb6e4154c20cc5d3cc84c90aab8e43b616e04da2c08b0e4e86b62c9a840a02dea467bc7eba39f699457c37a8038c5e81991bc3234dbfa5cba37bdab4e2
 DIST genpatches-6.12-21.base.tar.xz 1264008 BLAKE2B afb287c5e9e923f8e9dd87199579d3471a23a8dddbb537936ae652fc6a0023d3472cd964465e0771904a51d79b39b1e5b24c4534d7922279bb6da5b284e16c53 SHA512 c7c79180619f5a00d824717b273cddfa15b55adb7a645619f6e61f193f0fe8f8040bec2782c9a05e3d4896451148701108fe1d3a7730edb26d46f7802f5101f8
 DIST genpatches-6.12-21.extras.tar.xz 4056 BLAKE2B 3e9f15c4f81d5435193b58cc9ca334d88aba9e2f53fd4e92a4d03af361efeb0169c7bcbc6e5f63e84f76b7ea7025c6bf21ce265d5e382967191839a0d54f73c3 SHA512 aa3ce68cc56dbf92c2e149a9cb3c6e55e8b232d4984eeb30346d31070d3650724e2749d46eadaa103c8f40c9eb1a23c4fd66c641d31eefa84a60b988057d409c
+DIST genpatches-6.12-22.base.tar.xz 1317780 BLAKE2B 0a9dfe87c950f29ac195f28ad5b62e66087717a00a17cd0d8510e0f50629c863e14f7cb289382cb080aa0baca66e30ceac168e64b203d4e5cd24acf39c6f2c25 SHA512 f0e073bd24a3f2f09a2a707e6cec54cee9a6388af62ca6d4f49a2369f300a544c7e91ba1adea432a63dae4312ab430ba299dea930edcff72512652c482fd73c1
+DIST genpatches-6.12-22.extras.tar.xz 4056 BLAKE2B 73c796425bda6a7f04e253ae9ae75758c53ba21ec0d90a05f0a615f77122020a87e10292299d0a054ed692dca25f463e7978d2df09edb69447396eb11bf79a8e SHA512 afc390d43a0e5bb099abc7789ad2bc7755e03f387ca8ca38e3ee56c11962d801b71473a39a6083c3376805687382670864352b538de7310b5b963b002ec48480
 DIST genpatches-6.13-6.base.tar.xz 417180 BLAKE2B 69cafb7cb776dba4705d15c409930e7006775ecf92f7ce2be78fd2d43dcd04ee8b02fbcf4286545963fe24785bbaeada9bf20c47c45777e7cb2ad097170d82bc SHA512 eb3d03ab002ce5079beabd9fd5ad4423406fe00f1f2013989a8686ecdeb30ebcaba3df9878167ac930da85eca801762370b0538f14720d2efb8c65787dac5bbc
 DIST genpatches-6.13-6.extras.tar.xz 4056 BLAKE2B c87a50404218d0c961f2aa31f39dc5b98a3f6d3488e05e2f43e687dc01deb20395d4a5e9e98eecf8a7f29ecf0b654fe1166b6076d6b685f07c2bdfb33a9f192a SHA512 f11b487705feea7c9113ef6b624bafb3341ceafc9d825726a692b929b068dc1587d23b14e024c36ba04cbfd1e5bb4fdb2e1234611d3469759f018f009cd6f02b
 DIST genpatches-6.13-7.base.tar.xz 475988 BLAKE2B 0e65a5b28cbb356dce79000c5426b67c6ccea5931fb38059e797c954040a667da00ebf8523a73240e8e889fa8215c6437e670613c7346b11546975954756f5cc SHA512 48363b16244da55e0d6709aed745bb136ec493d006a903f7cf4e77646336b96191d6d3f2c165d186c1562ee6261880b7a7bf002510775690c062212cae911ec6
@@ -38,6 +40,10 @@ DIST gentoo-kernel-6.12.17-1.amd64.gpkg.tar 304424960 BLAKE2B 9383ee67bfd899d5f7
 DIST gentoo-kernel-6.12.17-1.arm64.gpkg.tar 277903360 BLAKE2B f9d615dd346fdf05ad5766772c662b124657be82169b0ccc519a7e8a9d9496625d7be7be20e3b6be9880ea63d556dd02be90a0cd9ff77f5c50d02baa1ea828ce SHA512 c8f1fe15a5e8a723d43dd3549e9be42b5b44d480e0f1ecb6f3d2b78737989cc3293885b429024b1f296aefd48d5c77102eaf8812579aa89f3052048fdb0a70d9
 DIST gentoo-kernel-6.12.17-1.ppc64le.gpkg.tar 73144320 BLAKE2B 77bb9e5ae5c3c60c82ca9b8ca051e276ce2149b4e9089499068a871afb2177da4dcf11ccad7208d1c4fcc1a1c45670b4901eb3f0fce93347a5988bfa9678d263 SHA512 a363890cb88b9406724d4ac5e378ed4f829b4d978b4673b8c00acb5c1a8e196a062229275e54d14ab47c3573a53ecb3f229264e719e257f1dbf0158ff744d6d7
 DIST gentoo-kernel-6.12.17-1.x86.gpkg.tar 77332480 BLAKE2B 74129e0753e022bde0e158471a82a4c305df297eddbac66f7ab135a88cbb59bd38ab555122c215065dff499fcb4bfaed95058998deb307308d7f371da8caf013 SHA512 de1c68472cf4b414b5b3a1a529881188b0d1889b08e9636bd0a3674afe1191fb260d845238b370fcbf525e9dd1b0dfd7d2cf3d564a0a4c78a4ba43cd414436a3
+DIST gentoo-kernel-6.12.18-1.amd64.gpkg.tar 304496640 BLAKE2B b2adcdf3c1fa42b41b5ff5f1fabb2ad7d52c209806ce19eed0d5cd90cdc0d6efdbcf3d94db1245f27ec087b1d6a344e48a5a6fb0f49d36fcb02ed39f2f957e14 SHA512 11f41bc24d59a954af3c4c9417dbcac163faa245757c9b0882ddaf61dfa1f2eb7c3efec6b8d2d02c000d3101df0b9b98191b07b810c9ee421ce5a057d8ee259e
+DIST gentoo-kernel-6.12.18-1.arm64.gpkg.tar 277893120 BLAKE2B b05b60102cf1b0604de19797de5e51321b2d949433985aa41920457a1183343e31d6d00cf44b0ea34368156514279df69954e8a7d3fadb205c26a94b14214f9b SHA512 96f9d2e6575b4955a004372de47aecfb9c7b8b5f74ffda93182263b3e7a26b7b4abf97e39d386f226efe98a64654d9a6682ed40ba186214fd0b0fca2bfab26ef
+DIST gentoo-kernel-6.12.18-1.ppc64le.gpkg.tar 73144320 BLAKE2B b2161315b4a7e5dfdaee82db84cb795a892061a78e79a037eaeed30736bf193c2bdc3e5d97ee95e6fff02d1e16da70669665b5ab131b4f8341d5d9deaaae146d SHA512 81905f1fa4e1deee6bc4fa756961eee15ef6dd1546ea25df7a0b0b11b1d61a99cf2e62e0da46ff64a5ea930cb9b31680806c08d3d631e733c918d4cab4973c96
+DIST gentoo-kernel-6.12.18-1.x86.gpkg.tar 77322240 BLAKE2B 058674f46799f3bfe54fda7453d9febb6b4dbc2aab26732ad5d9a77e4b8b9d1efd210c2cb59ad4c66a9a2ef596d9dd6ae5c89f57d7a44e43b0edd1cbafdc215f SHA512 d08fa42842e5e94574d08f4dd326fcf14728175ba6adf03d9e1f4cbadcda620e3c1806cef259fb8f30780fc502e936c5947bb2ba49c3464436e91b3df93e6bc5
 DIST gentoo-kernel-6.13.4-1.amd64.gpkg.tar 305807360 BLAKE2B bfa6617fb9fa1cc5cd4c94f0d00eaa9e5e5ca4906ff2fa59fc01cab8c5767fabc3491b4a964c611f031ef9d6f070a2454c18252b5c87d58a403aaf7aeb1ab148 SHA512 212ba9f66a569c6f99978397ba5469858447a5525b3128d2d884e99dbd795e7f3532203979575912c4977a333dc3fd84d93a1d7eb4ef1ab961877e79bf4ab269
 DIST gentoo-kernel-6.13.4-1.arm64.gpkg.tar 279511040 BLAKE2B 2845f71188b6feb068caef78e9b58d9818738ed23af2583e4ba164edd4d5ae108ff396d4be15dda6f5375c4d606450ff80009fc3078637fc52673ea1c07644ef SHA512 575bc231f15a1e84c615ff03e0b3ed6497ddc7382428cb193446406485e81fd487e55e03aec71a7abeaec472f25d45ad8e9449c7711e4ac1ee5e26eea276ac93
 DIST gentoo-kernel-6.13.4-1.ppc64le.gpkg.tar 73236480 BLAKE2B 36a298b8dbb2c581218d5534e1ae389e0494f46712cbe288e44845ab84bd167d667e3c2ce93ed9e3feba764de854bb97d7f77c2c8897164dd19f7f4a5686eeba SHA512 9fda52f55185eccc0ad85d05c4d47db242cea84f6c6bd7910cf2a7a388a6d23d2129584f1936a7d01d502e027fcfeb0dd0ddb41e46ecccc38d563a43be6e63b6

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