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

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

commit:     3c2aa2913b8c1a286810970a19fc3f0635a7db34
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 19:55:13 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 03:06:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2aa291

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.53.ebuild                | 170 +++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 10cb6483cb2b..249f3879c339 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.6-58.base.tar.xz 3154204 BLAKE2B 5b9456e93cb0984599e065fab0d05
 DIST genpatches-6.6-58.extras.tar.xz 4060 BLAKE2B 7e16c5d713aaf221335b81f3a301e9bb1e7f243d9bc6739c3dd07bb3cfedbe6bd5a763ce418172c838fbd3de82909cabff7c2e5c4b4f1b675098b709ddc5203e SHA512 315bfdf633398b3b1a9650dae88fdd0c1442336cabe45a3f2722e968f510da13050657e8d35acf8a313981bd9403f5056abea182a0115a79952a2740ceb4ff88
 DIST genpatches-6.6-59.base.tar.xz 3174716 BLAKE2B 8eded8d4d4c343869f587ecc2a218d124c34618494ded9d17b493f26894e545658021ad9cfa05bafd14389de07406f43a722c37276cc14096a3a7a00040e2ae7 SHA512 88e5ef8de0954f349e5c0745adb8f718dcabcd2e166c597c9de753c892eaad42c936984279fde86974b307858959cdef401f92f6f62a98bf1d4bed14cbff821e
 DIST genpatches-6.6-59.extras.tar.xz 4056 BLAKE2B 8d68a426082bcb168f74abb849a7a58090268c9cf098aa8982d9e700fab754a6f42dd833c1ee5d44d52f58d1a6b3da018a954d873ba131a2049a286a39ca3099 SHA512 ee133a7efaeba2abe242482825f4490e1c1b17fca64f9183713dca601fc64048288aa79125f7b8c0715f6c4fb158ea3a230e76b39b63d1a59dbecf80697ac000
+DIST genpatches-6.6-60.base.tar.xz 3204668 BLAKE2B 4076b1d74984ff1777a6d41d6c71a1a67139571314da88597e88ac0bd0067ce49ba7954b26690f8bb21009708e99be5e29abbb6871d8ab7c39740c243efc74d4 SHA512 91d0d2bef786151f9bb94370e26e8cc488a57e8307de018e068c3d4f07ff20cdb59516de1ab6718943286323812b999bf2b43ab63c9a79d70bdc7dd2ece68ee3
+DIST genpatches-6.6-60.extras.tar.xz 4056 BLAKE2B 605705101398b9b0954b1b1050c7a35ca0cf9db76cb8b83a8686e4d895e96cdb5852b82fb47808a811eec73dbdb730550b4bdc09a9ce12c9a6f08f1c5fbcd2fa SHA512 6809450ccae6d26a77195a10997fc1c28408d8b1dd64cbe9985b1364d29ba520f4d1035e55fab34e6f169c92357a30fa95c2a9197da35366b09a5c634b9950a5
 DIST gentoo-kernel-5.10.226-1.amd64.gpkg.tar 63303680 BLAKE2B d7fe1733fc5686e91cf3cd086e64ab3695f61f71d053901fe6b3bf8946cf67858b6fcec89ae4430b3d033c0a8c2069d3ad2c85e9f3dc12cf0fc3ed637fade62a SHA512 0b267771cda36cd5597d2e6dcada6b1a17dd0d89df8602bfa822fe94d7e844f0d81bbc1177b88a54879b273bdfbcc9b479c6210ed476f65b075c8e52bfd384f7
 DIST gentoo-kernel-5.10.226-1.arm64.gpkg.tar 56750080 BLAKE2B 7dd5adef82039d4aca30824168d5eb56d95dfc0672e7c401e6da9dfa3cb1bc4c4eb0e56a2a3a769cfe92e3c71d19e35af5c7017567cac6d5026b3b50e280b513 SHA512 fc19ce80ab64b670b48d67913ac81bc953e73d91f9e84f4421e6e7aea4302f6ba43db786b8f83626d89b47b881f2e88cc1794aafce5e75704f4d141a09f3b12c
 DIST gentoo-kernel-5.10.226-1.ppc64le.gpkg.tar 52766720 BLAKE2B 830c15ec760643c636c1294a8cea2ffbb0f46589196cd10a97c09e4d131a2e32398cf18f3f4d832e0ba1a123f031953ff3f931d86a60e6e6d80d8f7f5f0c446d SHA512 e1662eaf7551b54afe01a0b23f88447e3ee7684d17d6515fe4cd9e6dea28293d440b677a1e55b83583c74c5362d6e9bb5939314368c3e7f6bbf462b60e055dae
@@ -46,6 +48,10 @@ DIST gentoo-kernel-6.6.52-1.amd64.gpkg.tar 149647360 BLAKE2B 01a1b97fec61f0ed67e
 DIST gentoo-kernel-6.6.52-1.arm64.gpkg.tar 119715840 BLAKE2B 29e3adae14c15aefc7317a5a3074554116e75c3e4a752dce934f91b6b69466d9a8670e2916e34b0ca3e9267a5047a7ec8a1114e8e9eb38d9109358db9c9c54a1 SHA512 22a99e41b361e83a50209cfad36927651d2b74acaea5307ae7e784c07cdc4f208b34aab3dcd931eb1818dd704afa3034d1b75e3bcefd7fff133c03b9af7f1fd4
 DIST gentoo-kernel-6.6.52-1.ppc64le.gpkg.tar 64276480 BLAKE2B 1025401e8c36bfc84595aae09b639c1bf3ae9eb1d336f7fc61807e4e3f7811c6f2937918bbe18f20ce4fb5e2cc19e09858fae685d751a91a4ceefbeccef2e312 SHA512 2be94eeef0d5dfbafef0ebd03488918d744cf0e0abf42fd4b58b6e90b6b43941226c19610da7ee2dee9218739c0351b2261b5d611f5999b2a634cc233491f043
 DIST gentoo-kernel-6.6.52-1.x86.gpkg.tar 68290560 BLAKE2B 15936c7642eec38676fea6212e6d43349c196405c3d2cb176eff57fe46345f548febd44fd26b15eb44f17c4cda85e2ba3a68eea7a9bc3947a67cff06b3d22ed5 SHA512 85d84144e4e2388219c769143d1f6de8699e1cfb2650c0aa083c0edddd40786fdee986230877c9fcc9e8a4ba73030d385776ce7e73aa390275a05c6c585d9246
+DIST gentoo-kernel-6.6.53-1.amd64.gpkg.tar 263956480 BLAKE2B 61228713aece66af8e67cd032912b1fd843574142f86a740d1fa1d5416727b6affc866b72a79438f63cc7c40d37869451f76b46ba2e74317dd6d74f5a3ca828c SHA512 4ecee03c5e109ff32302105cd7bf66a623f63eaefe17750886087d834b451455c22009b3b6abd3de471abc6472049ef52d1ecd9e781a1444cc2916f8d2166ed2
+DIST gentoo-kernel-6.6.53-1.arm64.gpkg.tar 240076800 BLAKE2B d2f13d2339d633afe2205d02ac206cc33a1a4b1500df3776d07b1df62447ce43284695b20c8f51012edb8b878444b6fc520dd79c2449a3e7e1a2183bd42f01c0 SHA512 5c6fa8196ec36ac37dc27345a4d5e5ddd1213247ac0bd4976b56ebbe9175d839d85a4febd28904b55e3aac9b819affb3453741523aaf98211a2f7be42ae51c1f
+DIST gentoo-kernel-6.6.53-1.ppc64le.gpkg.tar 64286720 BLAKE2B f05b1351b0990461bb791a91172e2f1909fd4e577a4dd8b03b1fd7450fe99f8b92dfe6f2890bbd13d18de2cf33ae1551e07d2f421dac1121120ed839a46dcd72 SHA512 3239fcb1feb6283754f6e9297b4bee7894c71528abb12dbeb517f73b7f7aad24ccc203fe6dfaa0ad424836df5181e81aceea0e243bfd70f0d327d1af14a1cc1f
+DIST gentoo-kernel-6.6.53-1.x86.gpkg.tar 68321280 BLAKE2B 8c5d28fc8e59e3a8ade329b028b5ac91a6811adcf60f0fc5855b2a704989ca7bc3e41422e91c27fedcf9c7368d30764345139843aeb6a2182dddc967e6fe2262 SHA512 39c6e4272a323699b16d2e7e0eb5d674a58cfb6f9c9834638d1acbc753d9a1a11c720c13047c92a63c220a89a3c90bc2a7f6550589ea2f631a769768936a4c54
 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.6.53.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.53.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.53.ebuild
@@ -0,0 +1,170 @@
+# 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##*.} + 7 ))
+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 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
+}