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

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

commit:     2a5ca50df9ccb5a949a6380f0b09246d3292bec7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 18:37:30 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 19:00:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5ca50d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0281d5a909d8..d121274092e2 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.13-7.base.tar.xz 475988 BLAKE2B 0e65a5b28cbb356dce79000c5426b6
 DIST genpatches-6.13-7.extras.tar.xz 4056 BLAKE2B 955e08c33032fbb70ab68d49a52fa38cdd4314bf397382b38164b950f3a7ef6c744835ad427e6f236f133e14ff613b241ec75e6b1019fb79378aa9f93abb2f5b SHA512 45eb08dc01d303747214185f1b4c2835f786c1a06a36fe7dd12a5a4342d46614c738a42018a12c66c34ff87e6c209667523de831e3ae8d4db012409c599f89f4
 DIST genpatches-6.13-8.base.tar.xz 530700 BLAKE2B 8650d50f384ca432f277726ec238555fa64e4b037ed49d2405eb1c1a9f6300844fb34d41753ea18bd37a79735a1f54c7ce9af7c1c4e920efd6184a9283b79841 SHA512 c466145cff1087c565d9c3b77ed05cd9c5866589837244a60fd4eb7dfd24b4c093b03703058541f80212c4ca88c652700069e29890274094f9890df220dac5b9
 DIST genpatches-6.13-8.extras.tar.xz 4056 BLAKE2B 74359e29c6077971ea0748c3d75e1161e032bbd30c820e697c10bc1ce6595d49c14c71e10434a2531968f4a68d4adabc3cdf106547fde2e7b87db4933f5236ee SHA512 5cde4702c1ad427492575faa03c12bc1216e04350df3239ff8ca19393af4427eaf243b89a363d9022a38494618ce0355ac963722d1d60c4d958ad749a7510dcc
+DIST genpatches-6.13-9.base.tar.xz 591648 BLAKE2B aca872a5d7956455b59fd50ea22b3b5e1da834506d9388614a36103fb2afdb1c7a02d75a8317378a9b6f934f3e5c294d5ffcadfb92d4d4850c7e865f3df18d0b SHA512 9fa7338ee164cd22c8cd0c5f9b133d64db60e8029232cb12ff8219a5a124ad0563673347639507b3ea6be66b5c42918bade3ff5b0515e44577120b8e2da55249
+DIST genpatches-6.13-9.extras.tar.xz 4060 BLAKE2B f4ce8b701cafe532570d8066e2bc0a41eb2340f54a078a8766cd5f1e0c4e2ae5cbd17f6db1cea0b045ec92dc492d7a9886e9e0513adbc9bf5f3012efb9d7eee0 SHA512 43a23e9d3ad03b31a9de22270b89d6abf78247bbd9ad7a60e8d381c09affdb26e11041aa6cacaeef9d44be5b1b976d6d201047b3a6c52dd3e389633d525d013e
 DIST genpatches-6.6-88.base.tar.xz 4497952 BLAKE2B 65f393c767bd4edda1954fc15c90e07f5d5a67a445fe24063a94f7eeea23196bc0da417514a4048bd91b5cd330a309e69df4653846be0e0207abc649efa7f072 SHA512 16e5cc40edfe8edd95dad7e28f89b9593ee24fd380444ff67376bc95f71c71cb13b9a0ace7562ae7275c2acd405419534b8ffd66ee78a81897970b4c43f203ee
 DIST genpatches-6.6-88.extras.tar.xz 4056 BLAKE2B 9dce8d9362ca0e3548e31392659afb0b475eb0ee03bb71c51cac40411f35ba8ffe519c3e8438a05dfd140a8032321b8936df4f48cc8eb87f8fd6ce0635249da6 SHA512 02e4cd170b09901dc9bf2655065a8eb44e2330375fbbb2c3aa81d3f8c2bf6854403b4d7b412fa3d6bb377ec3e39f5091355a0b649f6a69282123e3d710464845
 DIST genpatches-6.6-89.base.tar.xz 4537568 BLAKE2B 9778c7c5767689142745d1d3d18dba49cbbdee9ed4baf64553c76acc962c8edd2a5b1e23c39c39c5e6b3988dd410b480359f7630aadc2983c9128fd28960d419 SHA512 c33a6996dd54955bbe3a63fa1bf8536dfc8e96a8ef0c00a4bb12feb3d2d0a251744ce15efcbf7c756af564528c66406df02e30008259398bdea959d06e79c9fd
@@ -66,6 +68,10 @@ DIST gentoo-kernel-6.13.6-1.amd64.gpkg.tar 307200000 BLAKE2B bbe929b347aa39e83c6
 DIST gentoo-kernel-6.13.6-1.arm64.gpkg.tar 279623680 BLAKE2B 702225525ad2a8c46cb8f696893a317cb5a37c4652ea1dbb0ef5ff3a296a3287e8b14a3d1afbe9c269adb518155de618e88dde4bc946d467fc05e67bd2084ff9 SHA512 912852658b35126edde7b42e4d4db4f8c396cce6d412c0223688f0416c68640441e685be46673a004d860a9c5e09822a5023eb4c091da9d81297fbbccedd03bf
 DIST gentoo-kernel-6.13.6-1.ppc64le.gpkg.tar 73809920 BLAKE2B 40fd80a4e59ae30e5b34cd100dd73ca0f8e4a0ccff3896a98680ae96f7d40189d5af015386edba60a8241c9b8be15c6a84884363ec18ef122d007804e4678f7f SHA512 0b964d7f3bc9821e37700554e298c6b25e4607c4981ab221455e9396d4317e95ce595dd791a668a77b8727ddb0d2f382a9f6ebe3f7a6f01ae778ff35c496b38b
 DIST gentoo-kernel-6.13.6-1.x86.gpkg.tar 77752320 BLAKE2B 1b88eeee381f9a6f2656d97c355d7556af464e01bd94b494646e23d58f94703407e54019c22a892f1ed4ded180fd097c826556802414d7b15ff2910b289e0a2c SHA512 d30597395957e1fac140a20acee6b7869a6d0c5f0942227c94000c9c157bb23d6bba941a2cdb242834ed94e26aa537a2c32363ad21e6b39482d0be392d5d0b90
+DIST gentoo-kernel-6.13.7-1.amd64.gpkg.tar 307271680 BLAKE2B b697d179bb155b9e153e45d2c828a0197b8fe11fad5dc5eb587769ffb06fb406524d7f5212d367fea4a817ff628aa251bbb316f8eb2ace420af0e94925e8ae16 SHA512 febc1f1265501c3bcc6117bedc7661255f2be02353a9ec7f6dc4fdee957c53d490e2aff450bfcd66fe47281cfe1acd952b9be73087930ff9952f3a3ab57869ab
+DIST gentoo-kernel-6.13.7-1.arm64.gpkg.tar 279644160 BLAKE2B 846f429cd9f6a91a4e7da3a9428f4e89214f64929a1e4d8a4b5b1b089656dd0af15bd54c204cdbac0782078602cc28f1a03a2fd747a4ca666971fb78a2b94e4e SHA512 ea12d58cf0045635e1ebdd60e8faa3b911b63e036fec2b8be818a0b8ede62a9a98e15e2352026c1953238efe525ae7ab223fec992a37da3665be545bcd2f4e81
+DIST gentoo-kernel-6.13.7-1.ppc64le.gpkg.tar 73779200 BLAKE2B dbc2f065016605136a288b52b02c8c06c2eacd464afcf6a52d4717e0f8b56570b8a53364beb039bd6d0301439c2234408a1e23f72d1dce3f9dc13d346cc83dde SHA512 0f0d5398ec489cb71b42d24bb0140ca8b3b45d0621fd40feda1bbc8f6dba2fbecfb623fd80d4f19614a40bba1458b70b823fe2f54abe9e85a7c3ae6ca336ef35
+DIST gentoo-kernel-6.13.7-1.x86.gpkg.tar 77742080 BLAKE2B 5812fd940ae1da2f42a70aa1ba811781161fee585796e96dcc67275c58077281f5351431151d72b48cbead58b40d04da714d316b2103b08d390b57435558a46e SHA512 b5da2cc5f739c63d1aa9f6193e14ae03470a71c77851eb9c8bda7433c9f0851e431e374e9c0baeb0dd3cdd7f4dd83a8aea53c1af8efe7560296a8c35acf39d0d
 DIST gentoo-kernel-6.6.79-1.amd64.gpkg.tar 273090560 BLAKE2B dfdc2f634661feb6e7d868939001c2750e5db1b15c5935fc6f6cb3b56208bd769649043c2b0ecd84258e515551460f801db3ab14041aa8f2b2f7d90a8dff1355 SHA512 127bcd146cea5ab070819c3cf946245585851b5fb64cf92f5d12aaddf31e3db45e491cbd1ee5b42701b5407a24256d77ff38e13ee574afc2992e014aee73304b
 DIST gentoo-kernel-6.6.79-1.arm64.gpkg.tar 246046720 BLAKE2B 3e76317748f6fd0647de23a6863140d0bc9ff496945b84eb32de5156fe2982cea24a9b1464aa7f401d35b460a18c0c28e77b8ab1914cbd12096912b39303e035 SHA512 ee8a7f7d65c299b6f084e237045f0b1bfb5f64499897c1b97164fb86e232ad3479854bd318caf2c90c58405accdf01a4493d01def588d68ad0b46e6a854e07e2
 DIST gentoo-kernel-6.6.79-1.ppc64le.gpkg.tar 64419840 BLAKE2B 2f22db03fb329e9072188095918822dd50d2804aa0b849a15e0a7cc63c6c079dedf8158cd7a63375533fe8ca4df5f58bcb4fc20b68cab06306554480203a1f90 SHA512 58c1601c9d8d3068efa9831631a9c3268abd35216b557fd37de624330ead3ce2a5cd312c8ea73739ec4d792f267e399f9a4f1eb0de9dae56b1945decc519127e

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.7.ebuild
new file mode 100644
index 000000000000..4426c8264680
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.7.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##*.} + 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}.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
+}