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

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

commit:     8c4b2e3799c728e94ad61ea8a7290e510692dc14
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 25 13:19:26 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 25 13:26:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4b2e37

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   5 +
 .../gentoo-kernel-bin-6.1.154.ebuild               | 184 +++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3d62249c1f5f..7912d4cc9889 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,10 @@ DIST gentoo-kernel-6.1.153-1.amd64.gpkg.tar 75499520 BLAKE2B 57deccf47fee3a87ddb
 DIST gentoo-kernel-6.1.153-1.arm64.gpkg.tar 68413440 BLAKE2B 71f93134b58a6a6aa6ee2c4a617f423920b378a9dfb8161dbf3e74930fdcb34ce3a4f7fde66d7c57c4e83f61a2b4653c311d8200c95f2e7e77390075a4a270d3 SHA512 3864894b608e14d40b35e91d41fe335574d9430b0020ff094317f4fbfd484a3db2eae51af892d8e4c13cbaf28b022e4246345f346b00e39a77abe66429917728
 DIST gentoo-kernel-6.1.153-1.ppc64le.gpkg.tar 61808640 BLAKE2B 19a9c15f88f3682d8815ee330a98c4ef427cee39b891dcdd1082a4dc4b2f57a5b372a458cad2b141bd35a3f9005c301cfe3e96f4a8637fb3415c250311b1ac77 SHA512 22f3665b69e5df49e20147f0f21110b1698b181ff4ac5bec2da627f40a4bde4472eb2405fec64ad6e26b347f6a5aab7ffb2c04ca82beabf6d6af205df770e79b
 DIST gentoo-kernel-6.1.153-1.x86.gpkg.tar 64849920 BLAKE2B 942a6dda678c3c01f9b428a0391fa025f6837bf284ecd06813c327409d3f35bc9eb9823cdb982ffc6f366ea571954275590985ba130ee9fbddd12eccfe09cea0 SHA512 0873481de0fdc9daa2fe1ebc2754ecb799dcb123563895dc36757bc08cb35dd057fa820d668d23e731b54dcc75c1c03136edb737bd218c644c881fab38b56585
+DIST gentoo-kernel-6.1.154-1.amd64.gpkg.tar 75509760 BLAKE2B 6af381138fc3ff188ff01c268e42c097502601395616258c7bbf823e47ba2ba1831d1e2ac7dee6cd75284a12cf33a205136c1fb9f901f9eac9cd4cd8af84c37c SHA512 2c4c426380791855038bd0b28ae78ca17aa2889418456eff27245a6e0ab354e4c08eab3c858921d0974f8fd9ead93d947645fe939e387dad8fdc8e0b56bd3dd8
+DIST gentoo-kernel-6.1.154-1.arm64.gpkg.tar 68413440 BLAKE2B 9179d94573b057a2e290925cfab747554e39459bcde98e8abf812814bbf6f9ca6f58869595d657f4e77f066f63cf78cff78f884efc85791f4d1c470c04114372 SHA512 666ebd31ff0db3876771a1e813f18667e8fcf3307acfdd7e8c25e6f53970d27b561ac24975a3d04b0cd35c081b180708dae64c8c3a8bb80e6efcda370f3351ab
+DIST gentoo-kernel-6.1.154-1.ppc64le.gpkg.tar 61788160 BLAKE2B ed574b864a3e199e31468136a01d1d4d007ea1ebe6af9aff1eb20812c0f94e013743c9b4ca315bfbf5d700af491978936911714f53cd7a04bfe7be2321246cbc SHA512 43286188c6766f3d963192a71394d3c4d567978bd23fb39e185ecf6613adfbb292b34a7b0f3a2a3383330e17c2bdda1aacf3ab1c38446d4286cc396b97e3068a
+DIST gentoo-kernel-6.1.154-1.x86.gpkg.tar 64829440 BLAKE2B 65f155fe80354d6cf8b31c8112564ff2c36a8dace1e9ef68e2b1fab226c60d5718439fd40bdbd83767f7156b7c435f84a7146e8629abb296351e92b039239af8 SHA512 3e155aad2ff26a218ff93bc640b60541a71097599f220f25d4dca5b09e4175e5a7cc13876c8c8a1827ef6279c77d071acf94adfbd6db4a264845c605a746f083
 DIST gentoo-kernel-6.12.41-1.amd64.gpkg.tar 305725440 BLAKE2B f13fe3dc3cc254e5b66c22fb6a2fbd40dedb500d240fe9bd6d69ac8386180a80bd97fb5f5ac86d22010eb5c1cfab8c3631eb4cc0c0ede759a8ab9e371d62edec SHA512 8cee06c0993c69ad2e551882022cdbbc083cc6a39a1e3be89b7ef14fffd861e9d5e6cfa5db963da377a664fa175d0dc6ffc4da1d91eac90467c2127b2a6bd14d
 DIST gentoo-kernel-6.12.41-1.arm64.gpkg.tar 279449600 BLAKE2B 46660c67f31a7ac9fb3c11bd5a092cb84bd290d11c19251c78636fcf09c1b86ec35fe5169448d1b7ca7d3855299c8b39f2e7def97eb687d434743f121b9f2496 SHA512 795a21c29b537348ef02d017ca04ec0b0d08f02ba3d485221ccc1791df6d5655a2ad12e854b005eeeb2feb5a2ad6f06439fed49c62365d82cb1f0f1d7b9de339
 DIST gentoo-kernel-6.12.41-1.ppc64le.gpkg.tar 73318400 BLAKE2B 322bdc40b8691cbf853e8296445aebaa67c6e964cbe60eeea6d15f73f055be4c8b703cb6f288aadea3e2a68cbd9194623ca27544bef26af59736990454890f0c SHA512 72b146dcc31c77634e81b3b898aea3f2c39d0098653f8d858c2f430fdc7198314b18682d729ff40f8ebadf8ababd4b917bca3136ab028b8305d06d6e311d9b3e
@@ -105,6 +109,7 @@ DIST patch-5.15.193.xz 7083524 BLAKE2B ceb5cafae883916d5b0786e2aaf178aa841642aa4
 DIST patch-6.1.147.xz 6320180 BLAKE2B d109214e0682653ead5f62f5699d0bad2764bae1765789720d780e74afefadc39faf8e833df1ee4cc1436e4db5facbfc7f4ba8c3b657fc48aabda3ab84a4b540 SHA512 2cfd04771f982da4b65caf53cb944bf9ae2888a32005428adce383c408c35c72bec5d88e49670deb87011f0d6bc329e0a53adcad065aaa716ad5c8baffb2fddf
 DIST patch-6.1.152.xz 6486524 BLAKE2B f9b532c867b2b5a15d28c08f89f9a30252b4b9d55dae069afbabc1f34eef570be6a39a6199e135c0cca18ede52accefa546dfa65342c8f6429a5b00280d1a56b SHA512 14fd84fc1f80125331940de767510a94735fce70f70cf71ef5868a46481ec146a2a6983af26935014547c90b84ff524a0e4a7341e8511fa18b92ae33fcd25a1d
 DIST patch-6.1.153.xz 6497932 BLAKE2B 67a540a290ccb6db0b4f83916102323a53907adb1d56874c11a11c91fa402d0a80f2151d9d1bb6c1dfb59522e239be788c0e4d5718b8039cf2016c7debd26a4a SHA512 d988204e844c17c18fa6d39d5712afc5a326374e82eb049be7c80d625be16400ea57accd81f7c550c69f8f803d01f48ecd4b497145a825817dca1b450f7bb5e5
+DIST patch-6.1.154.xz 6507340 BLAKE2B 5333097c2375c59b2bd73acf4b02cf60bf8aedb085031075dfb6c1df88995330e62163fda59e98e756b1456ebc3995b699102932b50e5e15ba59a1f92eb6c877 SHA512 268c89cef61d4fa0c83eed99f7056ca5483f855b6e78004c384c963cff3a21b68313683ced3b211d4b3eacc9481d3ca7e71dd8aa98912444ea1e10b5ed40cd33
 DIST patch-6.12.41.xz 2584360 BLAKE2B 8cb7d77a45e79b186e24bc59be15d74f4e9ea4b7c7f7b5c81b82eaa9b1a8b88a7aabff6768471d905e24539366bdb85593304365726307e19bcfa41937764bf0 SHA512 b9307fafe443eb61b0edc624b2c9ab7a0206765eb614683e0f01d7f7fab04a729a91d92d67b8ace03208d6b63088ff235203e8fdfad27adc97cdbf7df872b3c2
 DIST patch-6.12.47.xz 2896968 BLAKE2B 4064af2ae029d13d63a0a6cfb9e4121266ab33622c03e088ad3544a0f5bf443d75a2ff2f7c35b58d7cc8669acb0eac93165cd3bfe5d8567f332516850bc9f7a4 SHA512 19bb9e9e235fa408e3b37dd6fe475f1dc7690bd09274dcdcb722ccc9733da9169dbaa97dffb15e0b32da6a62cd89b2da8cad32b4d2f16f2fbbd9d023b5ebae9b
 DIST patch-6.12.48.xz 2931416 BLAKE2B 888711e5a4b9578bdd09379aac0b385b901e9784e1307b2c36a700f996e6deb9c2e6531ea2a4fd4daec6bd2cb44c8a7767d00e59922c2311e448592605929e00 SHA512 f7a4999b1f2d2019fcaf691a2c0f1797be73858404fd4825962ec32945733fe98f625d8451d9bc264a1c14500b4596be6b73ea947da35e7b27f044f08642f2ab

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.154.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.154.ebuild
new file mode 100644
index 000000000000..4c6561675040
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.154.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.1.153
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20250925
+
+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://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"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PATCH_PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	virtual/libelf
+	app-alternatives/yacc
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist'
+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}"
+	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
+
+	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
+	fi
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KV_FULL}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KV_FULL}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# 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-${KV_FULL}"/ || die
+}