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

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

commit:     a32e7a0ac3462136d25e1c40c806b042641e13dd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 18:11:36 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 18:17:52 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32e7a0a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 4549dae446e2..0f5a2c8e5f11 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.12-19.base.tar.xz 1138892 BLAKE2B d2869a9b38ce1ea0dea73a229f92
 DIST genpatches-6.12-19.extras.tar.xz 4056 BLAKE2B 444749865813cd1929f307e8c865dc0a08b47d4a47ab2a326425343ecf3c448ff2732099013c2e80ed7120d1b0ca9542f4924dca38e084b9b2e0e6fb4f5622b9 SHA512 4d7e0ce29fa72dcd7f7ecbad844c94e5d711249f4437d3911eaca901d422c129c987166fa4d63cf52787ebba77b777f552bbdca283b8431bf0e692af3448a5bd
 DIST genpatches-6.13-5.base.tar.xz 335748 BLAKE2B 167f3f37113e64882ac841e16344ff25a96e614d3a29ebb96b5a21ddf7496386ea4f2397d5a5df0e6ce1e98348934befad7cecae6e947ba94ce1551ff837043e SHA512 1b6d3777fc25d24d31ccf33edbca65b09a5b0f3f48d8af5058b4c8de7b32830bf6fcff330e64ef2b9220cd4a117cc571bc3f900b52e68d4a9277c2a7d1f1ef32
 DIST genpatches-6.13-5.extras.tar.xz 4056 BLAKE2B 452b32878514cf29e43de6103b298c41150b888bd78509e26211c7d39e6b8f23acff0f4a5c906e1b0a8cbbb939f0fc6a106085542d4f92bc1e6f2f85580df7f2 SHA512 688fbea8a74987de17fa4afa84a6f3904b39518db971d7ccea13d4fb4f6e7df8031c940e31c2297cf7b15c7d3ec49941232b8d9d352c69e8ca6233bf7b846779
+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.6-83.base.tar.xz 4270596 BLAKE2B f94c4d0387957b4384a893f37bd232eba24dac57fa73297f4c25822c2aaaf6e9616c402624e43daab655c31677a59129dc853914fe9817125281ed40139b0bc9 SHA512 7479e6ffc5e736cd36df2a3f66079514b016059a273ef92d2e120f8da050c0383f8249dbd9f45daa1ee192117942d339b0bbe1a6afb1eae6e118b483fddbb8a2
 DIST genpatches-6.6-83.extras.tar.xz 4056 BLAKE2B 5b28f9a1750f3aa6dd30c976f1ae8431a93d44967c52dab2bce6b3cc17c75c063ef675765da94a212eab94dc64d144283049570d413b5d7acffa7be207249557 SHA512 27a91748aa74628c3fdb78709e39166858280a4cd80f4d3241e96158d1267b79c0a6a3cbc9b70fb7ec9069e6c8c7f7210efa174ffca4aaf3234ec34083fdd61d
 DIST genpatches-6.6-85.base.tar.xz 4392112 BLAKE2B f373bf5719fe6b1148a1cdb8e38cc5a0efd60d78353c2a79b562f26c4156cd94eaf60e2534c2b9b6bac655ed6a58d294d1afc7961607aa1f505925d3cd49840b SHA512 95bd5611ee602478b46711653d022b0252027b101ac4fa6a6b6332308f6c6ed3f211b4abc858052d00eda6e3ca14a772ff45b0d4009f9b975abf2219049c201b
@@ -60,6 +62,10 @@ DIST gentoo-kernel-6.13.3-2.amd64.gpkg.tar 305725440 BLAKE2B ee907a898b8a59001bb
 DIST gentoo-kernel-6.13.3-2.arm64.gpkg.tar 279480320 BLAKE2B 36c36710d724c5362492ac3610ca5d58076cf8901268c4259285106abc8d12cc901b986deb401f7329459374f13f11f0288e2994a50d55bdc0c725698bd866de SHA512 1c50734a3bb42b3a5fe7aaa049f2d7ad76a2d15f6b9bf01e9972dacafa0d317f8e2eb56ac1dc5b0d57a04babfee7a55d9cd16dfbb6e01c8eada3eeb3ebca0773
 DIST gentoo-kernel-6.13.3-2.ppc64le.gpkg.tar 73226240 BLAKE2B f8dea1b39aa2b3cd4c432147ffbc33436c13460f2358445cd4c52bf52fda3a6776381d3399fb484c408284cb20cbbab92defe82514dd0f5487ddc455f0d563a0 SHA512 823377b0b8becebd70ddb7b7bfba6b20518b97508817c69b9f9021f13d760996fdd9c062902ff38af9d9997993b97b7c36d988dfe7135194e7611f8213ba5faa
 DIST gentoo-kernel-6.13.3-2.x86.gpkg.tar 77639680 BLAKE2B e3a9ba2e9f93c10ccd11157fff3cbd53cafd6b215b0b48d1db78bba75893c40b5132e4c919418a835609a67dd31fa5f477d8af694b1da1115133ee549e4d9f3b SHA512 24c733067b7ec9388360beb928a29ab55cccdd191048a2fd413e76a017d7e827c4294c44da4a4ac59ea6c55e6ede22956bbb97a7daa67ee32c3cca55aa0fb9bc
+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
+DIST gentoo-kernel-6.13.4-1.x86.gpkg.tar 77639680 BLAKE2B 6c8c1489b02b67fb8a5699d0ad46394a00d523e191ac542230f4cf580454281138a6daa973db8a907fd58c1987e7a3193d66aba44ed5b15622fea21805ea68b1 SHA512 5f063e8746d6765e1ce37aa5b484aaeeececacbd658e089db1859d2fa7d80f0d3def1de043330aa22d3781a524dd869e79bd239cfa78673d45aef52c0874a9a7
 DIST gentoo-kernel-6.6.74-1.amd64.gpkg.tar 270028800 BLAKE2B e74b3ccc5ba74a5138536eeaffb699cd7130b6e05fedeb4e85464def2eca67e153ddcc61a43be9eb6c46b402024411578b3abdebba26d4cca3444d1e84e7fdd6 SHA512 7dd5bdc97bfb69ab6d859d52823f737430d4cb5d16f20dac7c081706ea49b05de6dc4f17d79a87666133c45220e5d02f82255e7e469feffe0aeb3b7775257ed3
 DIST gentoo-kernel-6.6.74-1.arm64.gpkg.tar 245944320 BLAKE2B d113815afd6a696630525b13775d625c33f087c5c6fa817149b478b94153414eab8f413b236144b3989a043329b82c0f79f38679e1e6d65fab7c8fa4fb15ba43 SHA512 9f855f1882e40a1b596041c1370500baa1119ec3e4987ef500487dd87f62c1b6527eca4b23df4001cfc167f9375101ec938f783d717460ecff8fb218c371bbc6
 DIST gentoo-kernel-6.6.74-1.ppc64le.gpkg.tar 64409600 BLAKE2B 439c66dfb35eaf37b5f21d7a36f728230861cbf1fd3e4e7420af87ca2d8b45fbbf0b730ca17670c513b4a7bc060d5e13b3f99db35df4e8ad619940bcb4886ee5 SHA512 673bc0a287737dca8079466e1fe2fb1f07d19ca15f05aa4c5537f49dfd486d7ec73172025f43d8474707e48814407980b0b842ec410257241b5710bc169074e6

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