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

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

commit:     89afc5c6e8a29c22bdbc0220e5d76e825356d5d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 15:15:14 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 15:22:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89afc5c6

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.10.14.ebuild               | 171 +++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 04bbe712d80c..25ff072210a7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.10-15.base.tar.xz 774884 BLAKE2B e5363896fadb615a40b43b90c4146
 DIST genpatches-6.10-15.extras.tar.xz 4056 BLAKE2B c80ea0b763a9c37e6f3aa5192b712c0acc7849be3dab66c911b175af94a8e8b22afc7cb56a10f7fcd91a34e0ff5d295abebfbfd5de260f86c800e3227a3c651b SHA512 7e50e426d10736a8d3fb51180d58e434097b70b9675bc23b89539834a09ed343772764945925a2e556b1140af8561fa7231622513f185fdaacb81d7763dd6d02
 DIST genpatches-6.10-16.base.tar.xz 973248 BLAKE2B f91a03c3d8c1f09a4c51f17eddcbe3ef733da7242a61891647efae6c79b49bfdb589342a76a4955ae3e908e533b29f974ba414ea5649ec0a93826cf61ae625e9 SHA512 df9fb97cf87a0255afe9eb6c74c51dbe90bab5851f20097c17abc72ab00d63d2d7b4f2622f3db18daeee6cc8d0bdda9dae60bc42ef7844c5544c4eb147ded50f
 DIST genpatches-6.10-16.extras.tar.xz 4056 BLAKE2B 3a0dcfe962509bc0ab802688055d1f001b2508276f6860944c94d45e69cb9a453d9381f450f86dcf120ded7c161cc8714411d0bcb22edfc3ba1b78cab4ca21dc SHA512 a279b9fb36e66b5017ab142e71134d35097859f755c480a0ad3434d347ad5611b16b79f47a0f329a43aa3a8d4301279280212d76381d8bd45fe57fe1a6c2e9b7
+DIST genpatches-6.10-17.base.tar.xz 1115084 BLAKE2B f0638c12dd60db695f4c0d71a75b240503e9df4d1f85c2a687168dfc71c45cbc26442ab686cd0d66d2283ae736d61d51b1c72a41cacb2516877f57f52631f36a SHA512 c80f19e549505ea6b2e617a390d35615f39ce804a177039cc4f628d95eda18ab49547b7ce033af60f34400bad491e1094fd0621b90dbf69f61cc7c0f1148e842
+DIST genpatches-6.10-17.extras.tar.xz 4060 BLAKE2B 85b844a23a44636e7e9208adcdb1f39ad1e60dc02fb7bb3cb721364a3e4818fa874b0afed54e5e9469dc0459811244ea9df68df9a9c433f170e0ca23c10dc162 SHA512 c522aaacfbe492fad25c719bc8a4cc65180fff963443b113fe2d4bb1a09660c2f6eef8f7cd502f9e84fc8ddb6c392a4dc55929ea7a058abbd65dcc9521851ba8
 DIST genpatches-6.11-3.base.tar.xz 252308 BLAKE2B 4a410ef58fdaa2a24da1fef194cdc4db9c62c84fe8c02339c959cb0b4d679accfd9db2b013429b8a04ddc3248fc36d56004b7171d01df51376779906a2940803 SHA512 41e62846295d08672bf8d0a4b704c5578a7e4eb10712afe8757dab079730dba5a4a2e74f18e7c29cd4f971747bff5a595da707254c85b2070a2ec137a0374a56
 DIST genpatches-6.11-3.extras.tar.xz 4056 BLAKE2B 84e6bfed32549a2ee5752164a91cb4d01bb0ed4574af608a3a94fc7e78cc951398eb6404750b55368378c242286401382e8f2586d3a770bb6809bb92db085bf8 SHA512 a06ced9cdae186fed615fd42c70428ff025328800c15a1c52848fc4a52a456eb9d9c1158480269ca745eed03a8b91bb533867b46252d43b0a37673531c5b53bb
 DIST genpatches-6.11-4.base.tar.xz 429820 BLAKE2B 402166e1e2be81943dd191390608e1fed640c402c645b8a50784e9744aec0c5232ec3aa7b0a8c14a30936a98d415b768796ff8182ca23939c4469eb60165f81b SHA512 1654b813036688a97b514705fc43955930f080a2d0068a967d67d80587257270851f754ed4b7d98098e8ff0aadf1bea9ae025026b4a4848210b44d58b5041ed4
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.10.13-1.amd64.gpkg.tar 288819200 BLAKE2B 2285473dd589c891a9
 DIST gentoo-kernel-6.10.13-1.arm64.gpkg.tar 264857600 BLAKE2B a11f726c23ab4cb6e00818c65dc06101b1a31eb094e2c5a5934f520e3d07d80c7a617fc9b930578fc64e44a4ebef5ee26b7676e7b62f3153591aeed606239794 SHA512 cdc93c3b7b460822678509ae93d6afe3cad5fc6807bf4df6ea7c88780c81691d9adeb1298a01d21d851d8d1afb52098af8b091710b7d1ed599f54aff95551d09
 DIST gentoo-kernel-6.10.13-1.ppc64le.gpkg.tar 72017920 BLAKE2B 6abf40e9a021793dcdd5822c9336e97cf2428e7ddaaff9fe54dfa1a5816131ef4e5a99ca08119c86b3de63e1b012a75b44729f0652d23016e722edf91d12eabb SHA512 0f8d53cb7c523759b29db4597a2b61f726c1c7e9ab9dadea58540a314021375ed93e0ff682f3952e3e0970eb433695247739d4583c45e5803f927a590584d0ea
 DIST gentoo-kernel-6.10.13-1.x86.gpkg.tar 75581440 BLAKE2B 659e4d952918c7a38b1799be1240a7a8a87619685ac9692c4509cdce316b8c4ae41e7483b9e5723fe573597de264e268db03f87ab2a291cd94e43ffadc16416c SHA512 336630ab1c1a5175fa6ea1b2601578fccaf067946ac0fba2eb75a91278ce7d35a01b45489b9810083c191522a67060ced8183fc05690902f1a4232630a79c297
+DIST gentoo-kernel-6.10.14-1.amd64.gpkg.tar 288962560 BLAKE2B 44b6eaef5635c74ce7d044735d1414a8a52cd5bd52e7573bf52bc7967ebe367e43d99bbc41e810b93e77670d575032324fe69e789f0544310e27198ddc607179 SHA512 cf9418886edbf099d2a45f983dc4261e4f6e565d8c7de96b77523386502d0b73d0afb8bfbe2ee0045a15176eda5818983a9d6c887887070d624735cd73ab2a80
+DIST gentoo-kernel-6.10.14-1.arm64.gpkg.tar 265287680 BLAKE2B b45003867570a7f9a54751f5ef080c3ce32129d776eefca15fd993a9239aff4d7188a46f4a0b878a6f1468193e8295856994df894f55b58e7203b62d2c0a4677 SHA512 18cb039eab10811b74cbda128b1e2a1ebea7a2d168d137b82ac208cf05eccd964ff951d67796534edb0b49103f6a9c7815b00d1a20bc5ff67942ed244e1d0b6a
+DIST gentoo-kernel-6.10.14-1.ppc64le.gpkg.tar 72058880 BLAKE2B 9686f3249dc191106226aacdcfa7d2b4cc7df7525b91cdf121468b26a69ba9bf589f6b7f3807a1e40db48614797af4e1df46fe506ee6a99e1d33c8bf9696cdcc SHA512 76541e3d36a513b0ee2c9fa349dc4c14639b394b6058f7bf4dfec2df25bfbb3f6b873d21930b767ffef793ffa39308be3ce29b4baf2eb98cc9bee61098e59d7f
+DIST gentoo-kernel-6.10.14-1.x86.gpkg.tar 75571200 BLAKE2B 52bade7aeffd7c568cac5343aa595a1d7d83a5a8bdf4e0752a5b111ba0548aff09756dce4b1ec57d9f3a38b1e7b3696e27b6576836ae37b69e17919c3ebffd94 SHA512 7c110ccafbf48c5db07c85117cfae2655ef849f4b5f77e22ac9a728a4db2193afad8db7c10a68ca5851953e95befef4c672a8e154b127aa56967075d72821b6c
 DIST gentoo-kernel-6.11.2-1.amd64.gpkg.tar 290437120 BLAKE2B ab05d92452ffe85d6d43a084369b10f645e368b9bd1aec8e88255635d245408954cd7b7c5272342780a0cef681fb32b3fd8557ed7abbb5938794cc509de3fb5f SHA512 a7f59e92213df8685f4081eb9bf588e91d37bdd0169bc2db85e4683ee8197bd808297668f1747e99fa4db653f62b7bac5b3ed4a53f6e6088941845f8ac56baf9
 DIST gentoo-kernel-6.11.2-1.arm64.gpkg.tar 266506240 BLAKE2B 4307c1a177cf7f6c04c160ac32126d8f01068b7c164e50d222f958e8b0d5bb6a01f6144e43fb796e736ff6cedb1aac1718b969a1acc1cc653d051c8797eb8f48 SHA512 9187854b7eaeca1ae65b42122e0d572d418bce8f37a12015c500f365094adfe853cc8d933300799b2a34705bed1cb5854532550e5d6c1a22befc02a8d9e90c9f
 DIST gentoo-kernel-6.11.2-1.ppc64le.gpkg.tar 164065280 BLAKE2B 0e0ac3e089058e89c5b0d8a211d1e0c640d9e8f9c31de78dff0ac1e430960adc887bb1b68e60d47008ae157ddd9995fd5b31644ab5107799ab3c6efe83181b4e SHA512 ae98d1e68c8085e8b8eeec4e4a5c9efbe341b672551a961d96c9a7b11e729f5dbf747a08db14868ff1e57d497ae1b1d669b4a807bc89d4d81f0f0587f901ee97

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.14.ebuild
new file mode 100644
index 000000000000..d7138a37a18b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.14.ebuild
@@ -0,0 +1,171 @@
+# Copyright 2020-2024 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##*.} + 3 ))
+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/-2/-1}.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-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+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
+}