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

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

commit:     fa73d51447d89c6604e929c12a5984ee0d958164
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  7 18:54:38 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr  7 18:57:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa73d514

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.86.ebuild                | 183 +++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9f91b9c6c798..8d002d650ac4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.13-11.base.tar.xz 696060 BLAKE2B 1d90850c681688f299e6d66c6ab2a
 DIST genpatches-6.13-11.extras.tar.xz 4052 BLAKE2B a40b3c65ed30aa17797727e8df0efc37ea23639c965fe8acaa17f9315029ecf7603071f74d96a1623bc84f4d6d80f62f5119f85e714f32403bac6b300304a7d9 SHA512 a5953975b5e88bef1a8e8aa73f343343816db4e6731d5376dba6a3cc65e15b19e00e38817b5a5dfc5374ab9138ec1416a1d14143cdd41a52ba284ba506896bf3
 DIST genpatches-6.6-94.base.tar.xz 4728588 BLAKE2B 63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53 SHA512 9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b
 DIST genpatches-6.6-94.extras.tar.xz 4056 BLAKE2B 91ce861bb22c0e604dbc9e23fbc0a59baac8992f9c7ee1e1f3d5dbd28d3695f0621a6fc9b04af70dd16c0283af61b77d3560069b34e7b7457b3daf4db4a8e63a SHA512 a9b0632fb4c8fe27350e28b3bda5b2c2faf539e2d063e7ff04cb901ac4610c16537cc121117e283076f07318454eef6127aa326a401f932f197575baa5ea99be
+DIST genpatches-6.6-95.base.tar.xz 4736688 BLAKE2B bb95c2f2839f40a05b0277558a08d91a031e9066f8ba44f08dc1c9cfcae038ab431f8951734f37ae0b4c0edb42e7c3f868f495b90a7e0e988b8fdbd900cabc3f SHA512 c5b0bb418c4ce0cbf8e00da3864c37308141f757621c5125e33c283d92187efc234d5e2097e40ececd55b1c10398063b378b42fb7aca57a0864d04f0a06b3472
+DIST genpatches-6.6-95.extras.tar.xz 4056 BLAKE2B 4f8a565b8f4d422373984736276882979492bef192230aa838ca2d44732e684035b3f2fb2c18b85cf639d4b1ccfe910ac568c0cf6514b3af40b075ec53786e93 SHA512 50a86b05bc17f49336d39fbb66ec3bd4ecf1be534982ebbad2a0dbdb52f25250c8dcc80a7e73459e118d94e9c645fa422ad796d74226636bbe274aeda2fbd7b7
 DIST gentoo-kernel-5.10.234-1.amd64.gpkg.tar 63662080 BLAKE2B 08da5926b5b7ed9a6963584c2e157725f3de773435cfc5beb50b54b477ce6b45a05d8c95fae62ea8a057516ea74bd86332566287f1e94abe09676cb1de3da76c SHA512 8e32408115186ced223719eac7304f3d180ddf44a87bc95118d876353fe2a24b0ab2497a12396ecfcde1608891f6dc4c52d9056aa87e9b3ad0325ea451a84bd2
 DIST gentoo-kernel-5.10.234-1.arm64.gpkg.tar 56842240 BLAKE2B 5fd1f3f0959afb2edc6c3a6038b10b1930726ac177dadbe50c8034ba6dc2ee830307985e4634fc4881a8f03a6c268d20ae0730ae9e3edaa902d8997b93c66323 SHA512 a0930aaa5f4107b0e87e62a4f569c74ebe2a96e6c8f7947d7cbfceae9ace9b9ab287bf984ec07a0e99c13db65f703279cfbde61b94036b28cfa473c6f318649f
 DIST gentoo-kernel-5.10.234-1.ppc64le.gpkg.tar 52838400 BLAKE2B 294837fab511941bb5cc3a5e23dbd3d57b40338c6eb706cc5080123559d30b5b1f6bbb5ed6983bccc7ed8904fb1e03ff38d111153e9612ca06e772896eb11ef9 SHA512 65ac1f9f14b51adb1f32935c3d92fe32724d7b87b61d209f9966f25c312f93005fa12ae1cc6fba064a0692471476a67803c41da8e19cf8c713616bce64f4bfe6
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.6.85-1.amd64.gpkg.tar 273459200 BLAKE2B 77163f000eb2ba7ba6a
 DIST gentoo-kernel-6.6.85-1.arm64.gpkg.tar 246292480 BLAKE2B a3db12f0125e55a9af4d227848397b259418c9aae6ca15e88b50d1f54901a836543537ee991bf35d9c07ba35a4e3e0dd1f118d5879fc4e798ad120715924b914 SHA512 0eb02919d964639733875c3e1402f3c7a54251c678a12288ec8863545bb0c739b050a6648b04fa00884fa4d6a82d1df452e81c52cc38ad1f64a64157e88cb529
 DIST gentoo-kernel-6.6.85-1.ppc64le.gpkg.tar 64430080 BLAKE2B 52082ced8fc59daf2a95dcd924273b7987e814f6cd68e18e6e9412cbe80401c224088763d10c72dcc993c7a33fe0e6518bb9990c7d3315f45adbecef05538f99 SHA512 cea21d9a9533b6d55b4aacc11d3b4b25d8f297969fcb717ced2f6165f7f493d3e350a254d74f8fd3372d700608dee2f380a7aa62d21f507db2dbac76dba9dde7
 DIST gentoo-kernel-6.6.85-1.x86.gpkg.tar 68628480 BLAKE2B 936c40a022cc98b9771c8f53e272b5a5c5b3a4743c93260ff1427cd74543331481b89bdb3a8dfb6aee2c46b5e1d2622498e38636530a512a3bc73bc41c8b5e29 SHA512 bbcd96b22904bc9151ca17fc1c8e4e26148c9f9fa11e140e947a3e20ac7dc3e9cfe748be07fcc84f0903f6d72b15e92f5b2a5785d30cf52be454b751f8323abf
+DIST gentoo-kernel-6.6.86-1.amd64.gpkg.tar 273489920 BLAKE2B cb80d9245c65ce15238e709a0f704c8448803085ec69475b4b1efe8cffceaf52951aee8fdd1499921534b6b3c2cdfa95d250c57513877433c5dab3605784a090 SHA512 e1e11d2b24ad94bebd5e2c50778a563c7449d7e597b67ad30c8add61f1c46f57bbca32babfcbc8016e7112f68cbc49c31344a5bf7e61e14e0bc3cb211bd2c815
+DIST gentoo-kernel-6.6.86-1.arm64.gpkg.tar 246323200 BLAKE2B e1c0cc6b1f918a4745cb32c5d23127ce4010ea60c03487998f903277cdfeb8fc1e05f4e04f1ae92ee8c9d5c44ce18c1a78acbbb1c983279e2e52463a2773ce36 SHA512 5f98e4fef6a12f2fe3effa37a477c6e175ae80b7071e34fdaf51bed843241591dbc8b4f2f3442065b5bf64c479ab6a7ee022b8eb58f793a22a38384102a291f7
+DIST gentoo-kernel-6.6.86-1.ppc64le.gpkg.tar 64430080 BLAKE2B 7cb1054a300525eb14d848eefc89901b8c87eabdd42e6a54b3230837e82e650821489cfed4a253832e6e93e14ec98b79a2498186d7381c7a358fa644375a049b SHA512 b71702526dd2a873e38e42d6fef503069e76d3f70a59bfbdbb05519d7e17261a4b6587bf892f420d525eeaa872705bec7e63cfd28af01d5170e64465793dbe3c
+DIST gentoo-kernel-6.6.86-1.x86.gpkg.tar 68648960 BLAKE2B 84d365ed05035d77b63e793b640f71e67ff7155094d2efa9e5643b4b794bf5c258921c59a6976427d9d7eb45fc6cffb3732ee7d80b9bd330a71d9b84f0c0fb7d SHA512 ca1e4a6bcd673fee4aad2cc508f21151cad54664f32b7547cbe6877fa00c14db6e83e4ffdb1e2f74f1a7ed2379d946dbff4f928814f8bcaed72423500d63c692
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.86.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.86.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.86.ebuild
@@ -0,0 +1,183 @@
+# 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##*.} + 9 ))
+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 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
+		# 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}/usr/src/linux-${KPV}"/ || 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
+}