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

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

commit:     05fcddde634eeeca428593b07b28de456e5c6387
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 19:37:50 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 20:05:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fcddde

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.70.ebuild                | 181 +++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8973a695890e..cafe9eb2ccbd 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.6-77.base.tar.xz 4120472 BLAKE2B 99c511e049d8b375eb54c8c00688e
 DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1514ee8ff75de5781474f56a3655665c5d3152771e3379bb431fb73ce19780620de72858cf64585109033c851be05efb0f0 SHA512 afd1947987efc0268727e6019910aff4f8860ab60707a32a289a454253519137dd7e8da92ea2743706b124ef873f854ff8ed6b3eac719523ca5ff94f466b261e
 DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B 24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939 SHA512 306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271
 DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B 464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f SHA512 71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9
+DIST genpatches-6.6-79.base.tar.xz 4222900 BLAKE2B bcd3e23877b7ee2439eb080d304a346c539b2ea2a3b242b89cfd68dec8f3022d2e89b43c939ae11c02d60c93f3c0c7c6569fc41994a8faa3a1fc259d4065bbcf SHA512 a336717d2f9585ddfef9ed6c373d7225bce4c5a76a31d55bbf8998214b1a835435a7510ed5b4cd4aafb4f92e668f7646e0f7ca964bb1505b4bd20f8353f46761
+DIST genpatches-6.6-79.extras.tar.xz 4056 BLAKE2B 70ffc39672faf32971e8b3bf8e41fe2a24e65fb3268447b1c9278fef4cf9fd97ddf9045329ad1431482e6628af911733bf86c7ba7cab624880cc070e68d94f39 SHA512 c3403d427b07a3b70447143d728987ea995b0d3d4d79c1d3a874c3de34cc5c14068320847628de36dbb40cbe63540942969cf2b158b0a563dc34aba927e3ec5b
 DIST gentoo-kernel-5.10.232-1.amd64.gpkg.tar 63672320 BLAKE2B 43d75308443842d0dbc65d355c09ae0806c187c4ea3e9c87d5322a236081aefa6a1af8661ae1d6203fef60b574996b0dd53699bfe07eb67b08b58f1aa20c3995 SHA512 f5838299ec65113eeabd7e516375641857de9512e9b6bc4e85ecffffb91519baeea4b0eb2769d5e675740620e431fc9955d76fa04524c50f1c292518e8c42d33
 DIST gentoo-kernel-5.10.232-1.arm64.gpkg.tar 56852480 BLAKE2B 6f628a7d0b7feb82c903e2814b2f02ceac867270356ffd3d06ad5bf03a55da340e089739fac83ef727fa03148a7adcef5f00e295a26f7f88ea46cdecb7183b94 SHA512 dc06388259a4d5878c7045eeece9393edbd0981538ae9b7208e3dd4aedc49d9b5f71178812765242cd0383145529af4a273de165c15c1d72f2e852a18620227c
 DIST gentoo-kernel-5.10.232-1.ppc64le.gpkg.tar 52828160 BLAKE2B 1a77533dc0bd3072311120b62246fe8ed2ee57c06354cdd1aa3657ef2aa21f3adaa780910a3f357804fedd6d65006bcb5ba29d5786d291f51acd1142c706118e SHA512 de8aa68bc5960b5dcca618641fdb570dbb77b83f4f02a28f0522f491af0a7d83795879d9b50a1a19c780ef6d4b941019d9cc945af31b8eac7219f5647ede6440
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.6.69-1.amd64.gpkg.tar 270131200 BLAKE2B 27e5e7e0e330d7174ab
 DIST gentoo-kernel-6.6.69-1.arm64.gpkg.tar 246323200 BLAKE2B 2bbc570c961a505e169cfc8b4f762001838bb100bd1ee544b089218c9f1299093dc8b818319ab925abb44ba1a8795f74da706c71de0706fa8647d361464bc635 SHA512 4b37192c67872701447a4872e038f02876f19abb78ccb16b596e90a46d33654fef9956c4b1a9cdd54aa3b23df7302de81927c772b1cbbc1c16f6101423d7ae05
 DIST gentoo-kernel-6.6.69-1.ppc64le.gpkg.tar 64389120 BLAKE2B 38d41d95e482e9354f83eb71e3c552b87f40971fe1fe7c758aae16654304768b5089cb5ddbfdb06a7cf0a3cbf1e90ae3ba3e50c9046c13f40c1fc5fefa102183 SHA512 921d1f4a7c7dadf4c72541240eb550b43e0463c5b15f670f6ddfec41e00db464acfe5e5526ccce884b138f973f81ab454fab3a32f1f2ba7d9c52fc205f380352
 DIST gentoo-kernel-6.6.69-1.x86.gpkg.tar 68546560 BLAKE2B dc98e8d52ac1442f480e11e918e4cf8eec46868a20122db3fe393e9ef7b03a857aa48c86e97f2daa1da98934267b0049331f4ce10c72e076da21305b84838b0d SHA512 1c88fb1d1f817956824070b4f43836d471a04462d0026a88117654ca5f8b594937b35ad49e16f4a06c265f09cf62474b45659748ee998a40bad6f13c97768e99
+DIST gentoo-kernel-6.6.70-1.amd64.gpkg.tar 270274560 BLAKE2B 23900265e3e31a9a852df93b96e62ac371f1dc03a433f9f76d3c8bbc191349841a8dc19bc4c4d9d2f91aeb223213c3f8bcc6681469795b28774777b28a1e16d0 SHA512 9bdb58cd5aa029fae227fb7cb46cb34433597f369b26d234ff2548cc4e5d7795348f754cb52485485433f5e9a7dc995e7f0b11ffdab00fedff0c9f3efd435dca
+DIST gentoo-kernel-6.6.70-1.arm64.gpkg.tar 246179840 BLAKE2B 41bb0fe6aa0941fa374a92581c5c5ed891d2141c5058506778772f7d59032d8472961b57796364de2916c18af4e3297c616bc130e693cb3010a1d5f9e414e7f8 SHA512 4b7121bddb2933fb893cea937bd84ce019bec02e51418c5b895a198b007153528e700153c7c8cb41d74f6c0417426fb07eb30533fb85549652c40ed0c5c978ee
+DIST gentoo-kernel-6.6.70-1.ppc64le.gpkg.tar 64399360 BLAKE2B dd1b55aaf4214732ee77d4a1c2d4f30ea5cbe1f7c1c505f2f2b73160aeaf0307aee76045b93e951b012982a562edd52c0f8b155583f6538ba09a7a66f444c50d SHA512 fb2470a815378b8f24ac8dc7ab92498e871c551991f8210ffa3cdb933b88a3cad858ed966713a495b7f04f76efda454ccc46a6c52b99ed866f44b719e0907d64
+DIST gentoo-kernel-6.6.70-1.x86.gpkg.tar 68556800 BLAKE2B 9df52948ef931d59f3d00b90f886eb5d853b78675ab240bec0d4ed3982884d745d4ddd11c04c0a5fb51f5d87c5ba5bfcea9026b0ab3910df753cb62cacc5cefa SHA512 775aa6480e309cb1029b36a9c39acab0be96599d723e9bc5ee4ea2c9d4df9907f3269a79cf289b5ede32f49f5fb7738ac56a39afdf4ba9d133d4b233fb289a38
 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.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.70.ebuild
new file mode 100644
index 000000000000..a0a5780715fc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.70.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2020-2025 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##*.} + 9 ))
+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"
+IUSE="debug"
+
+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
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}