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

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

commit:     6755a6f4f76c34027d1c0654e7ced0629194b437
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 16:20:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 17 16:21:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6755a6f4

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f17309a47d4e..1137369d2484 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.6-38.base.tar.xz 2066552 BLAKE2B 61205dc2b5d17f15af23d8eb8af07
 DIST genpatches-6.6-38.extras.tar.xz 4052 BLAKE2B 7d25eaaf329cc043fd5189114c5d100f2a3dad9a97b0c87cfc9541ff95ffeb9e3a8a723e5c4fa1f9241c4fd67aac5aa1e4aba96f5cedad5609463b96bc272da7 SHA512 d5957d7ca9718bf87621fb4200b5bbc4e1457fc7fda1500714fc88730a4dfd4dce81e386bd2a2f88e02aff16c46e35402421439e6393a5ad15848d26d9056b44
 DIST genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6
 DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c
+DIST genpatches-6.8-13.base.tar.xz 781972 BLAKE2B 7e8d26cca0d5fff4e1dbbd7088cb88ca705fa80df33437e1d9ca16305e162757010fa5c3ae5c869c20ed8a3bcbc72f89e055b5b8af1bb9110411e04e920e19d5 SHA512 e57405fe56630baef2d062973576b33b1528640491164f1cfd64bf230a9f2afb0c75e2ac6bfab2f085b4b7aee8c138315a9cfe56abc52e7c1a5385e80eb66ef1
+DIST genpatches-6.8-13.extras.tar.xz 4048 BLAKE2B 095bac7134081b953aa4c7d5b40305ac572bee80eda680466a84c45bc4775a344dd40806aa6c0600dea61c9b7f9775e7b7481a364cc84aac3b8169bd8830ab63 SHA512 9f9a02ba1b8e1f13946d63d93f1e61959fc8377aaffc4a60e5b46e9f632df98ccbcb998f37e86c0f640ab478f6d0e7e0e92b1a0d04d076e1a0591841d90252b5
 DIST gentoo-kernel-5.10.216-1.amd64.gpkg.tar 63252480 BLAKE2B 787a17da61971c776a2ad55f2d95487073e31a0fa7765b564ff834ea6f6d406b685775b542d3eb25479c10c4348cace5a8c563b2c76c6b39054f0c6e6631a0bb SHA512 46fff78b78b7ca0989e95fb26bfaf9beeb353b943a10c8f6dc837f47133b0109f69d8810da6de6f006176401dcc04fad4a38d1a4b07b56fffa6672c96f26e714
 DIST gentoo-kernel-5.10.216-1.arm64.gpkg.tar 56719360 BLAKE2B 61a5d2a3eb4dc5434646cea9103f34c8b228c6eb337fd031e669836996e3f28dd718106138af1bfc6f8c9e193e6976a0380e20146ba9f131c876255a9e513ea8 SHA512 848b340e05a9be6cca74c5f1e0f876c74836929f84a1bee43bdac53bb65723da4fc6b56d6c02cc2179b01cd97a62199aa971e6d3169c25fdca6f8603e0639884
 DIST gentoo-kernel-5.10.216-1.ppc64le.gpkg.tar 52869120 BLAKE2B 3f5eb4bb82b76321988baf7187fb550794fc246fc369d2006a2337c24c5793ad3e2f9afa1c57b5121e43283d3195e1042f2ec35dec25593c0c7a14d74ad0acd2 SHA512 dfa92819e87f23d37cd51efae717837f3a08300f9a3bc7b7f7a6860178e5b87ec8203087f6d3120565c32589fcba9a70a473e3c708fd5522f45eda8bcdd1003a
@@ -48,6 +50,10 @@ DIST gentoo-kernel-6.6.31-1.amd64.gpkg.tar 147333120 BLAKE2B 52abf0ed45cdcf3bcb2
 DIST gentoo-kernel-6.6.31-1.arm64.gpkg.tar 119326720 BLAKE2B cb9d21a8084a1671a61668ae62c0dd7e38a1d0f0589b79196ad7c81033e789541336be6ed5a1e0e4a885475f9aeed1bcf40be4e95eab581094a96b90b318df4d SHA512 9163959e18b9c1f8607082b00673baa07a3b6786549091d42e52f81a5c7208e55b4e427adbd22297eee4471443df78cc9d7f433bb7032632d5fec817b5aea412
 DIST gentoo-kernel-6.6.31-1.ppc64le.gpkg.tar 64389120 BLAKE2B 1b6cd46804c1f67e6b3532f79ed738eab68cad833a08c728df765eb1986348a45f80eed496535e2fb1eb508c8b4f2cf03399e57437466af453f05890f40c3242 SHA512 981401200780db5f1bab92b96e05e5120641867d7bd83d91ed9979f08b5158a67fa3570ffc8048760911a85fbb2e7b186277203a8ba801ab9e02acf94fa61e09
 DIST gentoo-kernel-6.6.31-1.x86.gpkg.tar 68362240 BLAKE2B 3a83d8ff3ccc520a1bfbeef07ea0faf2870bc8b0efc0eacc47cb817e4f157e6a78ccf47d2fe95adacc5f38e5af8da7e851171de3851fb8de0b7135933908bcf5 SHA512 ba80ffcbfb0a84fe1a70e7838921ebcfc7a1d5680247cd14968a0236a8de5ab8c4ae0dd156b4aca1003e47c47d6b8bbef251b5239bbf7571fd510ea4917f0e60
+DIST gentoo-kernel-6.8.10-1.amd64.gpkg.tar 150886400 BLAKE2B 50f2ce73e9480045b6c06752c0325ed448d9cc7914f47d02b795c6dcb0fa9320a3884f92d967dfa2270f863498e6e1f9ba302c2025bd2f729df247911ec5ebe2 SHA512 ab2a0bd77c29addf8635698c78c8dcf473314ae4def00bc536798f39e3f4c77988b92cac07ccb20ce9678535765f8842dc4a83355b4ace80907f8e1c370300b3
+DIST gentoo-kernel-6.8.10-1.arm64.gpkg.tar 122521600 BLAKE2B 3175f3fe3fcaa08ec5813177475916db3589490e7fc1ebaa3f5f22fcc5d1ce251f934c5370ea16b17a2afd89dd7d46822e7ac0cbe739d534610d6181b2e4c5a1 SHA512 220b10b15838f179cb7f084df95d758f41e26dd2ed821152b8d1bf7cd60de39c6e587825bd40efdcf5542104b099d112a8165850bd270b32511591d7a4b52ecf
+DIST gentoo-kernel-6.8.10-1.ppc64le.gpkg.tar 66263040 BLAKE2B a896e0ef78c1055e3d6d71752858860e568a2b3b4c40f73836f0e1cc28eb38915bfdf8a04cca2b7986005b610c17a773f4aff624b9250d9dead86db064f1cd00 SHA512 0b1ef3e770775c27b647b37a4366fe33afc6df44303116c0444752265003dbe5ea5d64e1ccfd276851afe6c0b67b1491f886de76fc7d63408bebd14b21470b30
+DIST gentoo-kernel-6.8.10-1.x86.gpkg.tar 69980160 BLAKE2B 0a2e534c443fc2cd9db6505ab355d6506f0b27aabb00d286dbd40d64fdcc4b1a76190b722d9a1220bdfc16756791725ea6c9309ed1a154db5b33d37f8f4fa3a7 SHA512 9bbe5d5cb879b669d37b49c136d59f31cdef2bc1b02e458e1baa1cc93cfc71a93eebc3bb0c04cc88a7cbabe2b1aa8be506fe84bc760f02c8c845f1eb33d2aa0e
 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.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.10.ebuild
new file mode 100644
index 000000000000..9a4e621d4db6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.10.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
+}