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

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

commit:     ba23b53445570b7fbf013d89c1e11b214a43cb15
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 12:44:15 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 12:56:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba23b534

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7a437f98ebd3..f2cd64934731 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.8-3.base.tar.xz 250824 BLAKE2B 2dd35057816341b1dbdc9fc651b2cd8
 DIST genpatches-6.8-3.extras.tar.xz 3712 BLAKE2B 1477adb78ce367d923717752d92ceeae28cdebf82484d30b3d4b46ecb308dd6418b67bab000f37312a129aa4453910ee88db1d1f84a9e943b1edaf90d15d20ec SHA512 bc1ea41091c8a8d093652332c6c11ce727730c7b922b457e6935ac1a20905ad9c4bd8757812feee50315ab7658e388e6bb292fdda4b6f03edc1ee184b1db76f2
 DIST genpatches-6.8-4.base.tar.xz 388904 BLAKE2B 22339e2c3d8b06e98ccac88d877edeefbc5955af73ccc1bd0857ad22f33757cdcd7b851ebf0987b2927e0d6397149d034e39dd7a1f2e252355bed36ada7ea4aa SHA512 ab11669385ad58a45941db73bb01957fc7a0d4794768aeaf4ab78e078d25d3eeae4d508994e61fd7d4a6de791991c9f01ea226932f9d42047c38e2fc4a037a4a
 DIST genpatches-6.8-4.extras.tar.xz 3704 BLAKE2B 2ac07079b69f3a778464b287924fbb758643fee48c6a02ba36cbd17d401f5761e6f5d4fb82083eb9153c8a1be22480f3b12dc0299b9d605a4d8abac49ae2c7ea SHA512 5ef9d85730999d5cd1a4acbb1b35f54b71012a919440ed763dc0254ad146b3656ab2d3487df39274b1e3042167500a260dc4c620965226c450395066d950af53
+DIST genpatches-6.8-6.base.tar.xz 390424 BLAKE2B 247749a8123e2df23e544a36cc2ccb2faa4c419aaee081220c0002f74fab2a0b4395fe6f491a571cf7c497986849391a0ee6adf25aaf0cd43e9d53956ff299e5 SHA512 4d8e757bed34af028e024e7c1456375f7f97d94661b51d392144af8907e4c2ab6ebd37a7f83b01f1df7ba40f7871400d829e3e443d473376b129cac5bdd73118
+DIST genpatches-6.8-6.extras.tar.xz 3704 BLAKE2B cf93bc6cb2aa440538d76a4a39869be17297e76d70dfdfa881abbbb0fd63e3862c264f96b834ff6c3bc53e46941d449a61becedb78921c12c49b032874ae0be8 SHA512 6139490d83515ccfd8e6f2ff1f4ee39d4a9488973f38e08699150032847b2bdecb75293d8588765733256fe5028890cc2cd38ef528bf327fe282c812aebb326a
 DIST gentoo-kernel-5.10.212-1.amd64.gpkg.tar 63252480 BLAKE2B 3ce492216591a8c99b136e3baa7588a412917ff84dba8db91eb9d25c314b109f83009d646ed95c08a8af7a429f8a746ed824f5e6db679777cb19cf07ccef095e SHA512 dd29113f7409ce3d71df2354cd015be6c4943e13a7ffdd1609367f418aceb3eb6aa1687f9bfed20796b230dec1ed27b7bfa4c00398d3b65fa6109dee790a136c
 DIST gentoo-kernel-5.10.212-1.arm64.gpkg.tar 56719360 BLAKE2B d51c72f1bbf54f579869cb40ee9eb9b352e5a8521f4cacc58bf42310545a3305c90d7a518a86cb5d14c509ebebadcfe9a30e6d89c18f31061b3f84159b3205ad SHA512 29803f672fba9c74b88121f19582dc86ee72992b5c5e7a37dc52e02e27cb47839bd5d2e53247cdb2073374e4468663b83a5f79bfb6f0a99131a79127026974ff
 DIST gentoo-kernel-5.10.212-1.ppc64le.gpkg.tar 52879360 BLAKE2B 44e42395f00747b601046facea7b134bb06ccd45cfb4c5e93b39e3dcc1468702077894f7f32cf4e167db20bcf4bfea97f76003debc2439e6c3f56a4ec41e8c62 SHA512 06f4c7dc25d4ed4536a5a25d8e7fdb418483ef4aa03b7184c51bb5664739f7aa71416957f9edaa9e85e396fb395c4637e720d55d3b10aed3837a8da8a14dfc1e
@@ -118,6 +120,10 @@ DIST gentoo-kernel-6.8.3-1.amd64.gpkg.tar 150804480 BLAKE2B a545dae5c5903cc00b10
 DIST gentoo-kernel-6.8.3-1.arm64.gpkg.tar 122347520 BLAKE2B d7b1ac3f26d834afc01331d21f27992bb2d80da2bfd9b58b4364717d437a6aeca4f35c10ed71f8de2668afcfc7742c6877a6d8418cef6328a61594e14905fdc8 SHA512 9d6826d5e207052d4a5e31a9939ca536b36ba764d9e342feac833855996bb4a74ba491a3da525dd6cc17f038b10ffee5d433591abcd5491a63742164a49e4eb2
 DIST gentoo-kernel-6.8.3-1.ppc64le.gpkg.tar 66252800 BLAKE2B 82edb07cd7ff90a36a95f0628811306b437ac844908ab7c74ec19840c48f543120728be7ae2c7877931b871063aff58130fe1843bd088bc16c2c9e57c9c98797 SHA512 874194af726ae0f95b9d0c0669bf06b0cd36e7e8edfd27ccf6585c6e1426e9406196d8c8ab736ccf51cd2e7a86fa33d8a3e93bb5bb6343911246196642e4f75d
 DIST gentoo-kernel-6.8.3-1.x86.gpkg.tar 69990400 BLAKE2B 1279cb7249e65fbe284de3f004bf2bfa07f8b14dfc8b9766c8bfaf933bb423d983a572f10f5aeb813fa99098cd22147a0c5a00a57c85af498ed0dbfec57c7c79 SHA512 e2ee21d48da74963aa2bdd3f35c4ff5771828bbb833ec06efc60f67a318ca08f84f08779a4173bc2bfc0f36d30b461d7b0edc7cb3aec41f70991824d3fca5252
+DIST gentoo-kernel-6.8.4-1.amd64.gpkg.tar 150824960 BLAKE2B 40f44b907953d9ebac38d34686590f3a9a4ac2d41cf0d62d4f5309ae98634f6fd55ced6fba2d70768c28ea4f5f5ed8a044227cb7d8a07297d7297535f3e3119f SHA512 eb85e75ca623ffe632bf354e543baac0cee3305b23a6013000d4dd061b9cdfba33c9b7354cca1f5fddad7a4debe60e8aba5443d876cf083e08758cba4746f0fd
+DIST gentoo-kernel-6.8.4-1.arm64.gpkg.tar 122368000 BLAKE2B 5f58dc8d6fb37e7a646b33375cf8652b9c07dc260b92654e090b9c72458e1a8e92101a53537dc09253d06bf740def26eda824967bd95656f1add19ccc992732d SHA512 626a4cb42bd05eb55f867a88c771f7de6faf7c788777bbc1118855397a0bd98c513a2dba3f6faef90150900f9b204d31b6d8dc4859144f67ee88de0c9490ad42
+DIST gentoo-kernel-6.8.4-1.ppc64le.gpkg.tar 66273280 BLAKE2B 259d1b4d136807d8bf0e59287db854287b958711983348f0a1e7df7ac4d5a1cf0be4cbcb1ec22edf9fb3dc22e2ca7808797a145c94ab31719fd451f753ea420a SHA512 ebb0aa7ee8d8f71ed03f5bc5902b0e4db8d9c8c8eeb70896c5807b9c98d42448608bba76f2c6a7d6c329190d29f3f651e3528616456562bcf1e18752836e9e93
+DIST gentoo-kernel-6.8.4-1.x86.gpkg.tar 69980160 BLAKE2B 97e47db6394eb4e62fc80ad56ced3cffd962d3ad0b349a88446ee56cac708930ed978870cdbf2572663ddc84cc82869b5f82c4694e3bda6b64509531d29f27e0 SHA512 fdc9ff2018f769efdcc027a5bdb216bed372e8f0f7a95446af79e9e302564e9a9448600abc9b77dc554d8220bb4c12dcec7e73229ed85f14f1e616f3321f453f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.4.ebuild
new file mode 100644
index 000000000000..44d02e88809f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.4.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##*.} + 2 ))
+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}.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
+}