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

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

commit:     965752c4c7a5ee16e379e473801aae9df918f770
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 17:33:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 30 17:43:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=965752c4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.8.12.ebuild                | 161 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5b2b5e786476..ad6a826bc86e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.8-13.base.tar.xz 781972 BLAKE2B 7e8d26cca0d5fff4e1dbbd7088cb88
 DIST genpatches-6.8-13.extras.tar.xz 4048 BLAKE2B 095bac7134081b953aa4c7d5b40305ac572bee80eda680466a84c45bc4775a344dd40806aa6c0600dea61c9b7f9775e7b7481a364cc84aac3b8169bd8830ab63 SHA512 9f9a02ba1b8e1f13946d63d93f1e61959fc8377aaffc4a60e5b46e9f632df98ccbcb998f37e86c0f640ab478f6d0e7e0e92b1a0d04d076e1a0591841d90252b5
 DIST genpatches-6.8-14.base.tar.xz 791700 BLAKE2B b265239da8f8bf3c61e2f007d06a55205e2bb89f48b2c6fc2cce839205a65ef0ae412dab4908d1ac55de15257961035772642e2401f3a575f354539bafba6b6d SHA512 de7f53507e6bc9a2f752109514bcd916be51a4f7a48f92a8493d6316fcb3cd7379ac014e5dc50b716f67e157f5d27d042b24084e060653c7770e5af0a411fe05
 DIST genpatches-6.8-14.extras.tar.xz 4052 BLAKE2B 0e5895a033a4eaddbac8a22adc57e26d6a21a4364d0cdbc6c170b0c93d463e8a0ffa0c56dd011f169933b29b3b10cdc815301804005b005e1cc0981d677757b4 SHA512 43a3b2777f73f451a5cb27a77f94a34d8f60e41847997b151426319a7b2a05f925d0de6f61f26676c68c1d674b1cbd1f41f32dd5e09c8d9b220a929f9a5491ea
+DIST genpatches-6.8-15.base.tar.xz 941124 BLAKE2B 461b11b32b4a6a04fc2a94af5c4025c05c20dd116ba2fd09ae569bab017681d2acf0ab7d2e8ee9014ee3a1236150098894e4c331a12c6b7c524a6a57ee553cb5 SHA512 99d12dc01c805a9109972f5e8f551a68e92225e8b5d55a7e915c4420930fb206c352670e3c5eb350b3956792cea0ae6484be7b8502e76da428b9dc81ae037428
+DIST genpatches-6.8-15.extras.tar.xz 4052 BLAKE2B 45771b4b26f6aa70153baa6683d80daaa93e79fbf4359053a78da707b478b0ff7b538cb2888b2b1ca884ff4fa610c5cc680fba260bbf13d0f993cefc6b000d3a SHA512 c8a6b0f373426fb45c85dbb020bfe2d61ad72b2a02d019d1a42d65057620c1280118aa8db9e76bf8d1020d9aa4ca851278f2da05f5c4f0e52ab429efff33f8e1
 DIST genpatches-6.9-3.base.tar.xz 22900 BLAKE2B 6cc860e07ef37d83920accee580c0dc69592c2779e729739ed5457d411e5b9bd3ea6b73e57cbc4536f40172439365729ac1d0f921b19e7836c684cfa1fb556d5 SHA512 bd7391b1d987ab5ec9eeee698c04cee6587e6050954d0f54dd7ed382c79565a8929fe7ae9dcd32d4757ea96d4da78780b867455802d84c33dd185ff4bac0f328
 DIST genpatches-6.9-3.extras.tar.xz 4052 BLAKE2B 5c97314b601fac604449ffd391d3c1389bec1a5c5bebc3a7fc3678c44de8bee31431f01567ea7b239ac62c22c149d4e563f6f52336f0eced4a105b99a1a3b93d SHA512 84ef3f91d3c9823b7371022b276d3b5c7bb86fc7be00aaffeddca171438c21f70291e67c992fa75f7222fa964f049be2816bcf7e081e35fbbb31d68da8c5bd08
 DIST gentoo-kernel-5.10.216-1.amd64.gpkg.tar 63252480 BLAKE2B 787a17da61971c776a2ad55f2d95487073e31a0fa7765b564ff834ea6f6d406b685775b542d3eb25479c10c4348cace5a8c563b2c76c6b39054f0c6e6631a0bb SHA512 46fff78b78b7ca0989e95fb26bfaf9beeb353b943a10c8f6dc837f47133b0109f69d8810da6de6f006176401dcc04fad4a38d1a4b07b56fffa6672c96f26e714
@@ -86,6 +88,10 @@ DIST gentoo-kernel-6.8.11-1.amd64.gpkg.tar 150906880 BLAKE2B 4d5db6a1afc322eaa62
 DIST gentoo-kernel-6.8.11-1.arm64.gpkg.tar 122521600 BLAKE2B 77defbedd8b34a3b82ee147b2fbeb2393da4cfef13dd7653b3cd2eebadea44984883ba3f456e2b53df96f3d4ac25338730bad153687d00767bdc7efca78c4ff9 SHA512 02dd96519f4e03e6e61e1cd189271b764a94930fe4f464246d1ba310e55dc856fd213ae4b0ea76c9799dfc6fa6ab545c232ce870bdd9935980e48cf683023b7f
 DIST gentoo-kernel-6.8.11-1.ppc64le.gpkg.tar 66252800 BLAKE2B e9dad28b718140c136f1022e66db0f9ab7faded9256e86a4d3b0ac88273ac9e2588ce224c3bd8acc3733f1a4ed75905518c36149e7f31977bf38d21b9fa44c30 SHA512 f8cc8e975bcdeda8df58fa822f366a73ce11a2ce7103be6e8a529e16efcdae0c016ecd61d4812f8b7fcd1921003cce6053fcec2f8d50f83c410585d315a2581d
 DIST gentoo-kernel-6.8.11-1.x86.gpkg.tar 69969920 BLAKE2B 2db08dfdae5cded69d3650f6bccc881b0127cb4b1776dfedfbc83cc60f310289ff42e1de414a80108daf0ff5d10b2f30cef85fb844a619117faaea1fa624112e SHA512 e30a5f9b8de7e5c4be3ff991829b7d820be7584a1c4913454f0f2d0917dceb71f4136e1692e1204a62a8f7a5176332ce255be33dc38fa7050597a624caf5e049
+DIST gentoo-kernel-6.8.12-1.amd64.gpkg.tar 157716480 BLAKE2B 34c999e5e52635191fd7671f41cde05f8787235c8d1ea4edf5956fec4dbc95eeda57716f78c8bb13bd662315ab3e81155750d006cb6adf8a816a119b7647b815 SHA512 969fd3010916ce42931609b28c8cadd28ae4c9df4f6d6fa431fca087110a981dee1c8c05b5ce4be4a158a39b6c413d51f655d0b17570bfb96d007110f214d743
+DIST gentoo-kernel-6.8.12-1.arm64.gpkg.tar 128583680 BLAKE2B fd113f88b784c585421cafd43b2703d4863fa6d12e54909a06bc7b8142682c148ce051d3def40683255a2f7e5fc3e0d8fd53ac0407b1b03a932b8d4d3e3e81e9 SHA512 571cf36c6e7357ff468684121445fb8ab2eee1b5a695775af38f182eef0012b8164435ac1ad01d82b626b138d7f4e0f8e2e2df69db260ac01b9f549dee6cf043
+DIST gentoo-kernel-6.8.12-1.ppc64le.gpkg.tar 70072320 BLAKE2B adea2db1a2b6fef84767dfa256a5c9cfdc1263f8e2a7d1aec6870c678ac14e7c4815049a4b356c246696e16d1079dfa116d1241bc78912e0c033c2f3e38485b8 SHA512 0c25a69173ff0146374bb1b665917add30fd304c9bf2807246284ebb5341d42717f009d737c76abdadab64e2052811d37ef1191d768459cc35c66d1ac5858d32
+DIST gentoo-kernel-6.8.12-1.x86.gpkg.tar 73840640 BLAKE2B 9d7bdc1eb3f395455afc33ed650113e85e87dd86fbadbb7579acfa38f0b8ce27d5089c6d54f12c2d8450df1264633efec29ed6e528ea5be5c833019d882136ff SHA512 2ecd62c8cf1d0bcb6bc34c32eb42dd519fcd60cf185c1a99d7749d652e2c6e4052dc552cf40367f80254cdcb2967cf588ad65d0dd595fea5b001e239593a27be
 DIST gentoo-kernel-6.8.9-1.amd64.gpkg.tar 150845440 BLAKE2B 535d166d00958e4b4e499704eeedd76ff24a40df66914fbd54bb8574091d0c71f743a3da19f1f0b39798d537a56e5e45ec9d8dc0dca04fdce04d19cc3f823ae9 SHA512 09c1baf319b212def006d285dc307c59cf581dbdf892998f7eb40d76f453316ebe081de52a068688125091459c6bea5ad120c5851f53fa74b6c97f4014fa28b6
 DIST gentoo-kernel-6.8.9-1.arm64.gpkg.tar 122408960 BLAKE2B f74cc8f857e07dc82d1c6150074557ac33e668c4b49178612dbfe07e5291038f0ea4ab21dff4f3c556db5beb003cf6d39775685833106b9c51c1aa27178d47ac SHA512 7c87576ea64840555c1f38042c87359219f6b35f35a557ba155b9c930ab72c7316b58d7c712565ee6296c80591bc0f45116f56ac286c756bf25433003e25e07d
 DIST gentoo-kernel-6.8.9-1.ppc64le.gpkg.tar 66263040 BLAKE2B b9e3e8bfe611dcdc66e46623e2adf09d7d10bf4624be28e1d7df312ef6a2fdce40af669c4a5a63698871bea0c70361ce580557607f1103b873398ff865ee5d30 SHA512 bcb129a0941a2b5ac4847a97c688f6144dba0db1ae43542b7cad9ccef7825d9a8dcdb6218c43f549269a2682c59fc7cec86134067cafe0cb0fff3dc31566129a

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.12.ebuild
new file mode 100644
index 000000000000..9a4e621d4db6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.12.ebuild
@@ -0,0 +1,161 @@
+# 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
+	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 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)"
+		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)"
+
+		# 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
+
+	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
+}