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

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

commit:     26d0f700e68d4ee928d2fbe91745b955bfe045f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 12:45:57 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 12:50:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d0f700

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e4356a7e345f..a55ce1b8d5a7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,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-18.base.tar.xz 1138088 BLAKE2B 6490753d4f8036fc29e7040695e0c85f556c2a928b8afe275fe11707a75a3a167a52ca63c6193600332fff2fae4afbeb01e0dbfe5be81466a0883f0301ed025c SHA512 7151ba70619b2950ed6f2b46ceacedfa884200c8600d97718da0e1a8ba53b428633e6675235e36d1a6508e32287b69b195d1b5cacb1bafb0a08741db58b2b9cb
 DIST genpatches-6.12-18.extras.tar.xz 4056 BLAKE2B da0da8cc6a7691e748bc0068e1e65e9becc7357dc2046c520202acdfdf95d7032095fc7b5be642599b6b960026ef747edf96131128af3a21a7a5fcba6f5aaec9 SHA512 3221e842185265a129eb49413661ff74866377292b0a8345bbf55cfe162bf5afc1ee79644a8b81cac1bf370f432e54718bf760a13497d3505472d786bd8d3591
+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.13-2.base.tar.xz 15268 BLAKE2B cf7b141b036ce1f324e59a2a159cf031e05242dc82f56f65f280e93650c879c35fad3906b680394741a8582310b7924cd09e0b48887130e39ef713fcf4c513f5 SHA512 058545ff09be7f54889b691abbface6579a3f030830115a06c15182d1a92ff5e566b4989de65ec21c57a233f792b973408f8405fb33d020939b06ab31f3b1449
 DIST genpatches-6.13-2.extras.tar.xz 4056 BLAKE2B 87dabe3972da098d4491f83189fa2cef15d7212800f4daad3bb248a0895112def3ceebe5c6101eea3832eef329827ca53e2c0fbc82febac0158a461ee59a5b51 SHA512 526d45b794e14a6097e25f1a614680a76db07fd6c423362fd38378986f29fc139557573ad61fcd2a2f865cbe2e575528fbf57a04f2b5804f84fe89f284ca8c07
 DIST genpatches-6.13-3.base.tar.xz 206716 BLAKE2B 8e5b254c09e81896cf6228cda82228d055ed3b6c2ff27db2af4c0c1abca6dbbfffad64a52e864ee5aed5244979dfe4ec5c27916c62021816cc25cd966f1c843b SHA512 913f79df9a918146d447a7862d52ce14102a66b9c3112780e182de61ae45b867fca25c4e286dbe1d9e8b6922fda07e724d8784b47d378015998dcb42ae55c88f
@@ -74,6 +76,10 @@ DIST gentoo-kernel-6.12.14-2.amd64.gpkg.tar 304250880 BLAKE2B d20142f9ce0703545f
 DIST gentoo-kernel-6.12.14-2.arm64.gpkg.tar 277719040 BLAKE2B 8f08c58fb786f58824241d53b573b2a45ca4ecdaa9ccb6a74b0ff795bbc23ee4de006203e013d718bee2a47c7706f55bd1ad2f0296175808cf3c05435a971c17 SHA512 545ebf3b17dde719f0b27ed5f3eba132f5a4f8e70df2158bd45de479f089331ef4e0f94ae7fe505bcda5a51bdefb42035bfc3943abea8660345b34982da710b8
 DIST gentoo-kernel-6.12.14-2.ppc64le.gpkg.tar 73113600 BLAKE2B 00e973e0eeabf75072a5db1c9f990fa6877f487c5651c1a444f451c945edb66c1f02c827ce0c865a62b00054f31437905606e8a7cc07432fda8f31b862482e05 SHA512 3198b56bcca548ede2b81f3613bc57c4fbfd0be45d8fc13246588ac7277a6298380a97a11bd7059d4094cf05003ce238d4498e9273c09538201d179f7730c858
 DIST gentoo-kernel-6.12.14-2.x86.gpkg.tar 77322240 BLAKE2B 995eefdfab99d969f8c49add4f4895ac9982707664888a48a32add85367e3fdc0b7061e66a477e784e7a683c28471f3d7a780fb67f40108c3eec1840e42e4bbd SHA512 f277741f912cf8e6f96caf04c0f136dfedac624af69759f38b0db2703379c825fec694a91b0299c34dc775d4c2ab95d995b54eee14e8dfa5077ddb3411701496
+DIST gentoo-kernel-6.12.15-1.amd64.gpkg.tar 304271360 BLAKE2B 368946f3a675d7d2acf5170bd679ffcec94f9260539e0640cff1f08312d738a1177e71d0981b9adc4b61b11f0e4fa092c17e221502e4ffc0192526ce8cad9b6c SHA512 a977343ee94187e55ad2fff4c101c0315d5e0a86a36a8d2371c5efa5c2e4a91f878ba4c7b814bdd6247efd98a3c54402cc114ba0ae68815a8e3d2ee00270fdc5
+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.13.1-1.amd64.gpkg.tar 302438400 BLAKE2B 9332494e18e9e19df2a0b858e8f20ce2bef78c6dae9c0802464a8ee79281c7ef017655585be72098c9a63e2bb9efc4128e1dcd99ed41470f60346ac7da4c86d6 SHA512 8ecce0a52904a1e4d0335f3ad8c0856d9ff74119299f0b1621e86436d923a434d36b80e1fa626fbb8662af57b1bb8d0c1bbd2f4a4264c37873d9d86891f345e3
 DIST gentoo-kernel-6.13.1-1.arm64.gpkg.tar 278824960 BLAKE2B 9ff3d775aa63dfed2c318ef7bbca39647414ea667cc2b5732efa97900a896b0cc8bb03a0d538eb51ba9bb6a1ef48f6dd2f14590a225715e2a7309f1712b89e9d SHA512 d115eb3738ac79f2227c580affe90c7b0c89b623e2de6e1771cf599825fc650fdade345de794c543e5b96c7c0eb980186551ae1773d0ec396014a8c6f89fbff0
 DIST gentoo-kernel-6.13.1-1.ppc64le.gpkg.tar 73164800 BLAKE2B 3266957def06bafc2b2740c402bd59902731f6a0b173f570eb575fbad33ac6cdd52a35eb6984c99d2e5915934b06626ec07c0e91871e8d913febcf2d0305d049 SHA512 768cdeefa7bbb8bdfdbe1a6c0550beb6a4896688f194bba1a81c319f53bc263136581620ebe43ecd09a83b6a5302fa1e7e2333d6b85c82f73747d221e766d2d8

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