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

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

commit:     efea7306d9182df478aca668eb8e66e7c16d4e18
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 15:30:01 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 16:19:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efea7306

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8cb677f46714..6d5e6d2c2ad3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B 6872ca3238aa7b9e811ce82726033085
 DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e SHA512 dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
 DIST genpatches-6.12-3.base.tar.xz 330568 BLAKE2B 37e21093772463ba3d14744ef5a549d0b2af6091301e8a4141eec1e1535884ea775b55608750e2ca814a973f0b96efef0993cbc52e4ab5952f4d1c3f7d2c5b14 SHA512 f5c1a7b2d0e4fcf1b012fc3eb974e137079ac5f679fbf9afe03eb60393eaa326ab178685718bb55d5f6cd994b74f51afbdc1272b161a93d808672ee93ac8381d
 DIST genpatches-6.12-3.extras.tar.xz 4056 BLAKE2B 8b868220be5ce7d53d9bf680531efb6263b755c80dcbdabeddde97bb8925a1d7f26fdaf8c6b8274f0fc5efad1d147e9cd02a247ca6babfbe0c6e143afbe4782c SHA512 2b0bfff24309b0a71b842efe1522c54c320bc9fbbc7380d123b4cfb8435819baacc4bf85bdb5d10806544b43cd728e292e3a08c095664d6e5a52e3e9d11fea74
+DIST genpatches-6.12-5.base.tar.xz 331136 BLAKE2B 6af9e74cc62063482672566432da6173b605d67ed0555ca1486cc0ffde606d84446c40d832276a9ee2a6d2584aae4a8de22a186a2c5b68ced840135b87b37457 SHA512 4b6f205a9fef89118e408e492b179289338e9453563dc95746826f71f5c995d4b36ca14ff106ef5ed6112f5d8dcf6992c7e368ab8ad3fd682c9c0219956ff02e
+DIST genpatches-6.12-5.extras.tar.xz 4056 BLAKE2B a3e17cf0578b3cb3d5edb399e7030283c35cfb71357202de8b4ce28b0c21ffa5d5e777d6f6fa64f5791ecfac6a37cce3f7e1a926fc16bf75ebfe7029af9e4c03 SHA512 52dd7cb88876ad7a643eb39c7e86a3341438b3662b9821ee1f479aafd759962db247d7d746ae1ee63a4b803c28e8b7fd14e89efafe918327663df5029651c3ef
 DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B 19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84 SHA512 dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
 DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B 65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042 SHA512 728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6
 DIST genpatches-6.6-71.base.tar.xz 3745848 BLAKE2B ab33221175b500bce645d302fb32095aa15a536ba475b866c41087d963e57a713579ddde608d93a5f2ea823e7126850599b49522c8c7112cf9435fd85897805f SHA512 eecd342f586e1b594009f91fa1ac12399d90a164dbdbdb454414eeca9bd47ce04a78e0ceee28f889324ccc505112f6a3bb4cc093f88ed10a4c521869769f4e07
@@ -50,6 +52,10 @@ DIST gentoo-kernel-6.12.2-1.amd64.gpkg.tar 298711040 BLAKE2B 3cc56597f6d5e5df786
 DIST gentoo-kernel-6.12.2-1.arm64.gpkg.tar 272742400 BLAKE2B a88caed9d219ab6cbff769279b37f6d9c3553fbb2af4dbc2dae6d40c886e22bd9cae263ea7b12e0a00284ef2937cd5f7f2ccec61a283ac2e8b3561b9dab1cbac SHA512 06736046eefd5c121650c7beeaec3be0229397df821a5c6da1557c5c013a871e8bf10b16151d5e66e82c4e71f2ff79c533de1b70462b409dea21caada8ec2e5e
 DIST gentoo-kernel-6.12.2-1.ppc64le.gpkg.tar 73062400 BLAKE2B ff9f1535aa539227e34ad1d877bf6136e79e0f1fefcac1cd07d41d17ff33ea2ceaff3e3f441d580044d9c513788b1f0aea56792ccfe2cd3a8b031128b77c710d SHA512 a79e64abca134cd7bbed885a3bd34b0358396b16b6aaf94aa8b1af7ab45da0f840f356660b8f9f4e447f5061c49a424d4db54e1e7d2c6a4c8516d0a630a23859
 DIST gentoo-kernel-6.12.2-1.x86.gpkg.tar 77383680 BLAKE2B 7e7fc7f56109ed8ba3314f6db3c87df4c1d8bb55ca34d5c9c4e641d64870f31996a63a36cc3efd19c0456a5de4bc493316937f7118f61dc87fb650ba122713e6 SHA512 2e3950e4f0065e9d1b1454b02ba456462b6f51f74cdea694580deb0fdf56d9bfdb74d020da94d53e725c50dee884175fe415ddeeefbff01f90a5876622d26e7d
+DIST gentoo-kernel-6.12.3-1.amd64.gpkg.tar 298690560 BLAKE2B 38f8670f67bbd9ab5b5e7aace23062a9ed5c71318a9284096a9e68c198ac7a23fda82e4e80b94d49050cdca6cbb3c5a0b3ecc4121fc47cbbe241cb0c02c74356 SHA512 161adc3ccdd32d4f66295ae70d8ea01e78acc6ee6150b3b1a44f0825bb6f7f0b8bf7153b7c5d010e3257e72ed737ae19b644ff930b34d60ea9da0a070080564a
+DIST gentoo-kernel-6.12.3-1.arm64.gpkg.tar 272814080 BLAKE2B e562374063514452ead9f93905ac0a745f0eb7841aa1c6dc9d6a79dffdc4b939d8ea868d47e66277f66052d096285516723774000f0a9c8bc694fc5e83142f9c SHA512 9889b42c9ebde4a350a085477560d076384cd1da48090a629de1f71ae1aff3b15beedf1b630989b09602c77299fcf341e4d736a5519ec79d9424119a30d7bf1b
+DIST gentoo-kernel-6.12.3-1.ppc64le.gpkg.tar 73072640 BLAKE2B f10734adfd71df134f10ab7f737256fb6e2d1a475ca0dd948c95f9b4371e54ab22374afb17b68c5c9e4d4aac4e6f51ae8aa4b58e968b09c92c7fcea6932f833d SHA512 d9de25e1eaa6eac0a31c31be8d7cfa3b48ce89a940dfccb200f048c353aba3c6cbcd1acc1764203c2fac35c0e47274fb8f0d0f5ba3404e861d505e72f07065f3
+DIST gentoo-kernel-6.12.3-1.x86.gpkg.tar 77373440 BLAKE2B 0a6b4e351ea26fc033c82ebc83bbcac086ed3bedf169d1eb68a908113f2b8b6c7cb3ac0af1ab1898e9befaea5a1549eae8f3902f8c0c98aee2e7371b3775270d SHA512 bbcee4f339bc265afc6b7d9df25861f1f0f4fc426d740be9e20ac296ee9912e41731c1da5ada3832b36cd6a58e5b0addd27db1e21f5794e943f41dd22938389d
 DIST gentoo-kernel-6.6.62-1.amd64.gpkg.tar 266598400 BLAKE2B f02bf7a4a53b025a1c2da579f73f3b0222e0c1b06deb3657b39e70103bf2ff0ef5e56386b70ae70a0d6822f41626e574f620e1901d46a752c3d3cfdffac70318 SHA512 8a62586c680c0d0dfd3f498dca24292ef337797adb15aa200f2964cc37624cb2dfb537ddf42036640ff46237749d1313f1a8724169a78ed958f2e99f5d530ddc
 DIST gentoo-kernel-6.6.62-1.arm64.gpkg.tar 241633280 BLAKE2B 67f10267c5f7bbbd436c7fa44f1f0e9dac83262f58c3b297a681d8769c1d0577123b4cc3c45283aaf94eb3dc14189c90207d0415ea174737f7eec12688bf1f4e SHA512 6933a49baa988b84171cb4a6a1849c1f115cae4d09715f2d450fed9a8e2808a1c86b4af67545554ad91992d77eb06196ce1b395f6749f9547e01bd63f157a827
 DIST gentoo-kernel-6.6.62-1.ppc64le.gpkg.tar 64327680 BLAKE2B 7bb24f2f5d97446baaf70f15ad2f8437057274f371569caa7dda12c0e31de8be168422623d685609c37ef532b8b67dbc6c90aecbc561e7e86c66ca46945962bb SHA512 4936c616f77f1bd1a728778722207d298e7c596cfc4e35c0f3ce703ae4282e7ccce274762183a81cfa2feaadb456d4467a87a87c191abb3c72d3da5a498cb297

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.3.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2020-2024 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##*.} + 2 ))
+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/-2/-1}.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
+}