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

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

commit:     78f97980e5de64deb559c45c44f03b1ea9490c0a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  6 17:45:41 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  6 17:49:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f97980

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

Sync to the changes in sys-kernel/gentoo-kernel-bin -- notably using
upstream patch + Gentoo patchset.  Enable verify-sig.

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.96.ebuild                | 216 +++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7869236a947f..1ec03c079fed 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -72,6 +72,10 @@ DIST gentoo-kernel-6.6.95-1.amd64.gpkg.tar 272998400 BLAKE2B 2c4a7897c6043c0cc97
 DIST gentoo-kernel-6.6.95-1.arm64.gpkg.tar 246292480 BLAKE2B e31d7b73f394e0e79507de6421c2fc8202563f1e95e2c81842a106f2839aed4942a3675b5f8f5344ac0b7668fa999158ef01e2746864e4a0e681445694650553 SHA512 49eb3081d996c8bcbf37f658c1160942b1a45534a825110bd2a6a08fe8644587987c0ba48c539b9743f92c3b80780baca12093d8fdc7cd81ae6d9373182bf1c4
 DIST gentoo-kernel-6.6.95-1.ppc64le.gpkg.tar 64460800 BLAKE2B 1552587e62faab032c9040cb1ddbefe0cf94e92d31e8801fe1e91cba2636d8d12e690703fbc119053084efc33087e172e285b20d7a63c946b119dc1c8d5e7807 SHA512 90cb370aea0afe82f6d028e0b7bf6971b361bfd0ad8b3f71b7651b259b3d0da9126a614f23e74c41b065c533c35cc2f85f0d560af8e04489edcf8dcf993ca8e3
 DIST gentoo-kernel-6.6.95-1.x86.gpkg.tar 68648960 BLAKE2B bd281ded273ba97d0a0b755893ab03e2b0652e3130820c3195b6b355f0ada47898539a707de7987495fb0fb8e990103991045a7862bdb4c8c2d625382f0cb297 SHA512 f15c9f22368e30dd8cd0bc08de181f4ad6bff480da2aefacad4db7c597a10874710e1b216d7b15aabba7e95b6d2899d979643480a586d44fb416c09aaa1ac6d4
+DIST gentoo-kernel-6.6.96-1.amd64.gpkg.tar 273018880 BLAKE2B 2be944b3d36cf41011ce66569daf3e13c9010440a9cb698b2123b5cf862dc6ca7db757e9e4b942d5bf192efdf6056fa6004acd7f586ca60d5eed33278be6029a SHA512 166e691c9a313bbca3a4cd956bcc6882ba56cf094ec778cda923d68420f9be913b0a4ec51f4b20911651a4d238c0e9c6120a0befcaa7536a0daf0d286c0eeb72
+DIST gentoo-kernel-6.6.96-1.arm64.gpkg.tar 246364160 BLAKE2B 53810bf51b01d48cbe9795cab0efce73d72717c8cddd0285b41be7ac48143d0828e4f2feb504241415ce46c2378cc69d9728324c6e617c51bcb74388e0002a6a SHA512 30438dbb3f8e4cdc66ec6c564983f43c076b0c1e363313014df388bd5c5b7a02654543ef7c09e5591e348b51aa260f38fda7b1cd6f50a465069685ee40a58036
+DIST gentoo-kernel-6.6.96-1.ppc64le.gpkg.tar 64471040 BLAKE2B 95408098538fd92f0072ee445fd2e52c40cd717c10afa16e1dd06a9ea82c41835e785ea4457b82c2510cf4f54269a182b7fe9262b6d2a2dc85c65ebd14f0b4ba SHA512 fe3d6cce6ef8618ca43b131ad18ab83522f08cb2d75869760f220f0686e35b9dfa674ef3731bfe04e608842d6d1431b627c4d75d4d682663d6c310b430eb7378
+DIST gentoo-kernel-6.6.96-1.x86.gpkg.tar 68648960 BLAKE2B fd9b2a3b1ce4cfe31f851938c00295ca424ea06e7db6ad805b069676a1f1d1e4b80ef7f62b850c969589840dd49e4c3a201a3eeacdb8d152c885887221fd59e4 SHA512 2e97ab28a3956517c007fbd032838fd202a36136680e9398242f89c93806d10ccfa105d6c28cc32e2bc9501b4de4627a3a25de41516433a2bd3d9062d3d425ea
 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
@@ -81,5 +85,7 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f
 DIST linux-6.x-sha256sums-20250706.asc 154698 BLAKE2B 8c9f6fce58842bff04a7e67bfa4c526aa4f96e330eb1f340eb4a27255c7c3755143c3bde4b4d4e1a62a73c750bd940ef69902c0da37c8a0a308843bc978dc06d SHA512 4798b646ed4982fb2024f06f346cf0eed66c94dd1ca1972171101b6848a476b85b9deb5937421b643fc760171a246e348b5fb0809317be82f849be4db81fa8eb
 DIST linux-gentoo-patches-6.12.36.tar.xz 17848 BLAKE2B b1257367ba4d02ef5f1bce8846368badd80e27f3eef8bd0c6f906478e0316b29be4b0b8ecafc550cffa82fef78c656672faf74682edb8d6ef92e80ac5e0d8c20 SHA512 c84797f87077964699edb5b7e34682b99d6fa4278d177385a6d78f7de409ec46eeaf40917443003f7bf5453fbfe608e28cbb05553c27656a0267e6421988790c
 DIST linux-gentoo-patches-6.15.5.tar.xz 83692 BLAKE2B 0b0831734f25b00a3523592439625342d12b0361b56e4d8243f94c045a27eeedbc02086032f01240d26807721d55d8a4011513b5610d1bf4889e35b7ac171afb SHA512 876750fbfb36f75ddb69026563a2d43310e116c567491a5428da30383a38d9384b97455c7ea61a1faa949b44dd22f402262c63a3701568ef3f8ab2d5f67f6c0f
+DIST linux-gentoo-patches-6.6.96.tar.xz 41508 BLAKE2B fd1a612b4376ffc7b916dba5c1f7b7d54a2f7724e96b44fbb1be929ff09868414b2462a37dd57f06960eba3c981088880ce350b1d5a1def225482bbb4f1e6971 SHA512 913ea1723e814930a7f78bf46cfc7d677a4f574f3e1a17b2a2af4075e86ce3d88de59cc1884dd2e8b49975dd293ea190545040b9b1f430bd74d37b88e58b9a21
 DIST patch-6.12.36.xz 2388056 BLAKE2B 9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498 SHA512 4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f
 DIST patch-6.15.5.xz 538604 BLAKE2B 3771e14cb95010a9e553191af6888fa26dd5f1084c16a1df3aad97ed2a03de97cf1af8562a1b7c0d1977dfba1f3973e03079278b72943ac104c4208e1eeed315 SHA512 ff35f126fc24cd9fc2ba7dafb10e2c4dc4643a2165893d6dd07ce0ab49bf33d4b67ab33b32875b74371749b5e6f93a061114c9837bdb48203d50b5ec55db5a65
+DIST patch-6.6.96.xz 4574068 BLAKE2B 047878c4c04057b9d2f342850cbc41d0dc326dc9ad7421500cefc6e8c32a3a769b0f069f6348d1ea0663cf8274e6048a52d900cf48cd18c5cfe3e9808c5133e8 SHA512 dce4c83f605f189c8bf2fe0c96118ed56d5d686a145605d125e532e78417076f84a7d85e7b8bdc71d7b3c0c7594a82403d7a9231e61f88ee61a05b43adfb98ff

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild
new file mode 100644
index 000000000000..8bcdb837287d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild
@@ -0,0 +1,216 @@
+# 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 verify-sig
+
+MY_P=linux-${PV%.*}
+PATCHSET=linux-gentoo-patches-${PV}
+BINPKG=${PF/-bin}-1
+SHA256SUM_DATE=20250706
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	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 )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${MY_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	cd "${MY_P}" || die
+	default
+	eapply "${WORKDIR}/patch-${PV}"
+
+	local patch
+	for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do
+		eapply "${patch}"
+		# non-experimental patches always finish with Gentoo Kconfig
+		# we built -bins without them
+		if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]]
+		then
+			break
+		fi
+	done
+}
+
+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
+		WERROR=0
+
+		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
+}