repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

Michał Górny <[email protected]> Mon, 03 Aug 2026 14:32:15 +0000 (UTC)
Newsgroups gmane.linux.gentoo.cvs
Message-ID <1785767525.e1836aaacb255b64bae49f6e7fb8206b15fd0169.mgorny@gentoo>
commit:     e1836aaacb255b64bae49f6e7fb8206b15fd0169
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 13:08:36 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 14:32:05 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1836aaa

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5777e23c30ec..5af06ac5f409 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,10 @@ DIST gentoo-kernel-6.18.41-1.amd64.gpkg.tar 466810880 BLAKE2B 2256bda95e6155aad8
 DIST gentoo-kernel-6.18.41-1.arm64.gpkg.tar 453212160 BLAKE2B 984fcab4a43649444bfef734eb1aefe226add7920665b3ac62722d21a5d81b127c6e1948859604d76ffb28c15d0fd83c6fe85471729815e5ee8757ee3bc04247 SHA512 9109e304f70c0f2cd809c2fa0d6344feadd1e7749e2db3b8a58b639bd1758d59e3d9fca2857428315abdb2649dd900afb1bbe29541be858c94ca560a4d9a89ce
 DIST gentoo-kernel-6.18.41-1.ppc64le.gpkg.tar 77230080 BLAKE2B 402ea5293c6c5fda3dd5db920ba2137a72879f3d135f99472e026b999fc83682cd19ccccb077d2af10a016904567ef9c897289a56c9f7b35927b1a7f1cb50f49 SHA512 60f3ca22203f3b48df6a6c237383b24b0e5880b66360cba87297c56565d6b93787746428abe0ce4a38fd6b581d27192b58d50a0baa5a598c8f484ea671d7ba91
 DIST gentoo-kernel-6.18.41-1.x86.gpkg.tar 83640320 BLAKE2B 3290557a300d7a4a45d4f7393e5e14717e33e4dbe50ae7d447bdbbd56794855a833109388a78165a89e9040b09e881a1f0bb35202c91bb05fdd993ef499c340f SHA512 5a2ef42f2c669263b49feb6e19fc7d6854b5a7abc3a41849819c8d625a45c4ba09c7f483e4b1bbf40f29e21944d8e49bbeda87d334e61cebb205c0050f12ee84
+DIST gentoo-kernel-6.18.42-1.amd64.gpkg.tar 466944000 BLAKE2B d6cccc68b3f96bc8fefa6eb5a71ff97d68085018135a53c02818ab3bb39d4741a8d3448f36fd3660bcfa37fb179f089b005d43d03c554cf8afa5dc1dd0c9ac7d SHA512 287a4f20f6e2a13d961ee2b9f93bf2564d1c9dc75c0482ec4c1abc3aaa93cb4e8695cfd5f8e3a793446cb1057a65ff8c8f2d72d980f24f9ca08d39de9f56992f
+DIST gentoo-kernel-6.18.42-1.arm64.gpkg.tar 453273600 BLAKE2B a4d1c6777b51d28ba1f193836d2346a87126a1699f14b469a5348d05dc663766c2bebadd7d700a8e04ee45e1d90b1c12becaf49667dfed210ae8c8459584b008 SHA512 8e15169491daad34999c0a3031cf2bb92826685c02aa5ebbfb41dfabf361d60f4899f7e89e51f42e84e60d95ca50c4c3ba020f7b322c8e35aea5a74c89a28936
+DIST gentoo-kernel-6.18.42-1.ppc64le.gpkg.tar 77209600 BLAKE2B 1283a6bd065253f091fc7f63ec9e9ff299e4a81207acdcfb3f772529d46207c1892e2efbb5470b17eed8723b103e5bd7b488453096350bf7e4fcf2c531390086 SHA512 b4af11939d879dab7c97784496ee8f7d7fea16c04f6cb9a007016cc3d79530493b709874c32d5957b744718cdf9b8173e17ba5390f8964f3b93f54628ba967c7
+DIST gentoo-kernel-6.18.42-1.x86.gpkg.tar 83630080 BLAKE2B 7bd4e5280bc46bad969aa32bf438741e96645e7724ad563c2747497712acdd782b23894432cae9c26d41f149b590c37038704d15369bea45ebca82bfda51575f SHA512 4c33f57004f57148a2246ea1bf92083b025318f419e9d01b188059b199a46f80389313f805870f78f06d014c3c83166566e02145eb274cc2ca7c6f4f31551db9
 DIST gentoo-kernel-6.6.147-1.amd64.gpkg.tar 290682880 BLAKE2B 11434d00be8372a6461019e8ac8a6ecb26d0486f4e03c1db2dc78e602d7138566b4a15daf269f0c0abcc6125efe2a38e1fd44b5d3a6f9712f0d9974e60d7a754 SHA512 fd07dbbf196ff2a4d3434269e8d6682cd529eee387bef73e05d13ed802d78f03004caf74c27a288bd1bdaef42b0b256e4be61141c509a60af6d4e1ea67492b29
 DIST gentoo-kernel-6.6.147-1.arm64.gpkg.tar 260782080 BLAKE2B d52f00c98ed3d3a2535928f44184b074a80c0052331a10716b35faecbb3f7072a0a0bb3696b08853eed5cd65d08e99382c33f00587e12278eb35c4675953ff57 SHA512 cec538c195581579af3faefc17ebbd7acd1f9ddef70d8d38cbc2d6593f22ba6b708c8c00962b773ed7beacbfbfaaf4c0dfc323b61ca9681e3e35bedc95241110
 DIST gentoo-kernel-6.6.147-1.ppc64le.gpkg.tar 65290240 BLAKE2B 9bcb97c0209bc8b9052608c0a07445dbabfd17f44b2f16ae3d0b95adf2333cbd9c569a701d239be4eb02aa75594b38415c1e96dbda470b87cbab2e3385874cc3 SHA512 184ee8a0e6bf3b879be8de0bc41972cc164524281d28dc0004f1641c4801fcd2f6c0f670780b5958b384b6c8777354e429a7bf6211c91f94832541d8713c511d
@@ -27,6 +31,7 @@ DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581
 DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-6.x-sha256sums-20260730.asc 237001 BLAKE2B 947bf4d979b19acdef3ce14d87a0c4d0902d44bd4a046e921e84395d82096f022deda19cea1004672b290872e83ef24a96846c20129513384192534d7cbca0ad SHA512 ed329d60aa847bf705ff017bb75b3667dadf219d6977d92869043bd740d6a9be03b3a36d61641d32c2e74ace99d04ee3e2c66e550de2449223bdf3f3fb35f5f8
+DIST linux-6.x-sha256sums-20260803.asc 238028 BLAKE2B 3681da2ed7cf30afb939a4abd66400d006a531c10b44c5cf1fd133cd050d27268d66be17d98620b585f3c71b05e73c35fa3a2a2fe6a58e0f9b2add6e0343e271 SHA512 042d9fef481598bafba5b881eac685f799b85313435197d0027b448dc3beaa5b550ba508507e02f085244e72caeb1f2dc63243af63a70e7457988134f69a0608
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.x-sha256sums-20260724.asc 7879 BLAKE2B 1e2043f96ea2fbe6e4f89049fc4f835f65422b698cd9fe7f0c5c9eca05bef143700914f919876bfe22a25ce7f2243df93217070e183161c8513dbabb74735408 SHA512 3eb0fbda0affef13e5f9ecbf34e9032ea0fa4bd4d8153f023738bcf18963630990b055b0264dd63ff8a72da65b1ce786c4a02a6fd639965cfc5e54c0813c923b
 DIST linux-7.x-sha256sums-20260803.asc 8212 BLAKE2B 53f9b7e979042e10c05ce4411386a6bcbfd02d412d40c2f49eb295b8224741ff1202fc16c99041c101949260a0d6405876aa41d4db019816b526d57961c0727c SHA512 f5b1d7c6078bac74237eb330b8fc0ee51a29b36059843107fdcab3211aae990c30a31e12122268d0f64a4c0f8df1c865cc6345a9f6e32453147c52272f748e49
@@ -39,6 +44,7 @@ DIST linux-gentoo-patches-7.1.6.tar.xz 9584 BLAKE2B c87be59dce825d5bd5fccb260eb1
 DIST patch-6.1.180.xz 7846572 BLAKE2B 8cf59bea6c376c6e544b8afe42fcdb19bd00da7b5b984d0d0ffbcf6f44c2d6d320eac5a9ffb3cbdedc5ab6ba840c7e779b1f8676ed292737eb6543793b049b10 SHA512 04ac7f1330e4d9dcf3f8f2bb3b8678ee345dfbfa47e66ac4ba842ff80cb834b6bb49dc513a88726855f4f35eb9150d0c899a0b2e7df5503183efa7718a2b2acd
 DIST patch-6.12.100.xz 5245604 BLAKE2B c0fb332fb1bb5ed18cd6dfebe40569b975073ed2b2c7101c04bb8c6281a1a0dea999bc6985adc50860233e4c2ca57c394090625bb83a288122a0c3fdc8142ba0 SHA512 09a74ff66e3bdaa9684ef98c0a4e30979bebe319f119b14b87a62bae2f52d995abba4194ce11ea5e02928d140707fdd7e8e2336a376a0507a5aea1c91a55dba4
 DIST patch-6.18.41.xz 2796664 BLAKE2B 354c5ad7f53b85d1d3724b7d1571c2f7c202d83dd0ec4f005e8741b89e8e41fb8e93ecee4bcb1473588a55f610f131c557124c210d47970f3239fa24f9244eaa SHA512 10f64066a9c5cf297981e2df6eef31593b5c33f55546f3fd18733c55ac1607ad8e4229f538f3027fce27dda178bebd05bb99fd1b3d8a06e3e8f5b8f481c7087e
+DIST patch-6.18.42.xz 2994988 BLAKE2B b77b0cd3520e35d85918b234ae26122354dd33d397aa055ad259e85855c07fb8da2969e99ed5004434e1a1cce243aa6692422423dca70605049dda6ae3434ca1 SHA512 0705532d59b0e52ec0f26440af45e4535424a7328acc9384ba58fe2cb333351cb87b21364efd42dde21c9a8759057eb1ce8d97a995324dc8d2d254069281f4c0
 DIST patch-6.6.147.xz 6568988 BLAKE2B 764927281faa4332ff5a90877d613563cf478a82d6af871ebeb131fab3425eacfb756c9078e8ce4e4833d8e3588468bfcd24a8187ceb844251f411edd2dce174 SHA512 fce2fea6b3ae26ee6e66ef5167a4a6d3a6b3832283fca7d62e0d20af2b6b2dc43732b955143b8f1d4b8153aa27363e9cfab3caed647d6dcf4ac4f2b6deee80e3
 DIST patch-7.1.5.xz 882648 BLAKE2B 484bfd4ae3ee5eb7da2cc8a58138c1c0bba966fe99e8f47603ca3e5f8de50c470301d19ac69322e73d52637e00e73c50c863d77a442fbc2008a8221ac76e3cbf SHA512 fc3cc487e2a633b9c2f0122a2dcdc3e515b4ad433c72372d7cf489b2c60ac186bc6b5ba9a1a7ea40683a5387c0300349ca6873d2938dc4ed2292e77f1743e01f
 DIST patch-7.1.6.xz 1102916 BLAKE2B 3850fc2be353ba0d5936a755c0ef9bde19067cc5cec57075a5875ac136c8813a79d3ab3213ef314d14a0a312c109b404cc5580b6dae172b846a104fcd083b0a2 SHA512 b0781089712ed4e2569a95bc22d6dccd5eb138b9c2810281b0793525889b671495b0b3e9d46956ffed854f17743258078ad921a62df84c0f316bf5b44f6c1c35

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.42.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.42.ebuild
new file mode 100644
index 000000000000..31504ffddf6c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.42.ebuild
@@ -0,0 +1,222 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.18.42
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260803
+
+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/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${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://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${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 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+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-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	elif use arm64 && use generic-uki; then
+		die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+	fi
+
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	# Override user variable with the cert used during build
+	openssl x509 \
+		-inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+		-outform PEM -out "${T}/cert.pem" ||
+			die "Failed to convert pcrpkey to PEM format"
+	export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+	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 "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/.config"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	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
+}