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

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

2 files changed, 187 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b303cbd38a35..b0f4f7647ddd 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.6-65.base.tar.xz 3582916 BLAKE2B 3d750c677e61c122144de989a55db
 DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B 53cdbf5d680c9943d189e7606caa10c18bd3317789ffc1f120bf535255d80bfb5e3969fe952eb0da3c1001ee41e93755616332363465d4714a67a90140c43bfb SHA512 b5b3c817426be391a72633740beb4ba7b4e2546ee441081906d77ba31636321501af414140d487d284de325f80d004aefb241f3e349ef3ccd62d2c6fc4d7cf7e
 DIST genpatches-6.6-67.base.tar.xz 3647888 BLAKE2B bbbefd68b7d6ade81dd81f600717a529f023d7e74ddc4762698554ab6c3bca29787082aeb1945136abd32e628c6bd9b3e4a164388beb524f51af4497217af34e SHA512 8d2a1481d1b23044792e523b4a6845fbcf29888e6f98a6a3b0b5b3fe909a9ea40272087071dfe98da3e1a954c6d8c0539d087c1616929aa76d504ad88baf9878
 DIST genpatches-6.6-67.extras.tar.xz 4056 BLAKE2B b8240a27f81aadce548d5c94cef31531ac5e5c42cfcae790cc54c9bb6c8ea7c7175dcd9eb81f0844d31efcf3728f68b5bbdb630de5ea025b25fc2a37c64d73fe SHA512 5458a8cfa22fba5ef27fd1b46c1a31f16e1a9e0b36897694c3a46c2273101bd7be56dde90b3c4cc2f75eb02383f518bf5974b9c446a4ffd3fecf707e935748e8
+DIST genpatches-6.6-68.base.tar.xz 3686816 BLAKE2B 56331bbfcfab2851304dc8263025d66e7efeab1bbc4f4a4a3969e08cf239a90f4e9fcbd381ea55db94682e8e45e6f2e73748f50eac44ad65dcf50e3b1feae75f SHA512 29b269918f54b72c4ac54a3a80d9e2cde64fc281ee6ad236be3d44e7da8ec58d9a1aa9c1d94c02cc88d28456cd9e4128bf15a381b95402f32226af9669876cb7
+DIST genpatches-6.6-68.extras.tar.xz 4056 BLAKE2B 61235851cf180cc5a8e17720907cfcad6bf993ce2387e3ec4012ddd8a23e24d28b02ab2dddaf1a95125c92b31294655f294a7f3b1b5fb6b8597b02959f047126 SHA512 4065216d3251c0af7bd7471667e8cd17a62d9f9f7a1f06a208cb7ccbf65160ee0d6a98088f872555ba9ecb8403355eed80a0ae6b20aa4326b1f43e876edd85ba
 DIST gentoo-kernel-5.10.228-1.amd64.gpkg.tar 63313920 BLAKE2B 2f18168a59a42f434fc1c0d89e4082833916c270524da29726a14ac81ddfdbe034dac693b71aadcb76d5670387c3c3c337543c9732a158836eac2a3c403daa9e SHA512 cb90cc8932fd1be6e084b6c554eec2a755b5b99cce7dd1dba76a7ad71ea90a89203bf0dd8e314fd50bdcfc79df04e22639d58f09b5097845fe7d7900baab510a
 DIST gentoo-kernel-5.10.228-1.arm64.gpkg.tar 56760320 BLAKE2B a1826c8fac94c3ac7eb6f5f71e6daf5bd252eb09ac6d56dde19d382036a68b4b83897ef9e7d88008ea88fb1949dc2e49c3d58a676241355f7f8118b6229a4447 SHA512 19e4e68593240e0f253c87b4c1c48d815f6715762322fd6bfa6b4fa8220b61bb7165c089385a75f0507ad99222cf4b7d93f3ccb29d27e7729d19c934722ea7f2
 DIST gentoo-kernel-5.10.228-1.ppc64le.gpkg.tar 52776960 BLAKE2B ab5193491160aeaa4aa90c5fa9ac41b3eb8878a5022da78037e5b510635b64acbbdf3ce6c3739cd1db50a935f314af10269638198a1b292e1d3f3031e0f9e3e3 SHA512 78106febb98e131cfad5bbf6c7aa9a2edae627d55ca9e09bdef11af3306cc952e9cf190bc2ae19435e5f10854e276a0fec18b7bbfe95fdc2da198b92d5424d61
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.6.59-1.amd64.gpkg.tar 264232960 BLAKE2B 8cba25ac2c5f99e0be8
 DIST gentoo-kernel-6.6.59-1.arm64.gpkg.tar 241254400 BLAKE2B 200d596d2b5987da42a3760a933d54ae845b1c36faef9593daeb47d88e3f38a992a766b65d74684db9e5953790eb2c45abfdec689d1c92c538ec280372e37f63 SHA512 aae3f8997a79ab3cc488746ee0ad4143819eb4e21655b18ade655fc92ff79ca386617b5154614fe41ac7080efe5c362b5c92412fd547c2e6385dffe4f55cf952
 DIST gentoo-kernel-6.6.59-1.ppc64le.gpkg.tar 64307200 BLAKE2B 4b325e6cd71d4e786adbf884b83e9ece2a2ece2c5b90703f98b6040743021d197ffa13fb011161370e3c8811c2d4bf6981c9146b9839676461eddfe87991e11e SHA512 d00faa8d9e26059b75a16940fcb180a907a233340abc140d7d54a3bc07f2b00ce3000350f1af3b6820212fd92ec27c0d91c1690e04a8e3706180243b2a25556c
 DIST gentoo-kernel-6.6.59-1.x86.gpkg.tar 68331520 BLAKE2B 88bc194fce1338a20ab4617684445dda88ccc0d9f96a3761203ca8e588a685ecad72354a99a75114ee0e99c7a478c055eb934703013bb4a2c677a1313732b53e SHA512 86522a267ebbc233cd1b16e0e11152ae0a4c2829f0e0431d6b858ac94c3961528db5f3de1ecd3c3f65971a558acc523a6cdb4f8c26abb515b047c463c9e88d82
+DIST gentoo-kernel-6.6.60-1.amd64.gpkg.tar 264560640 BLAKE2B 3db17a3b6c7b39253db6f954b89f9645d7ca915ef52da46a0fdf10773121c14afa637c9c1300b16d5a495a3e52587eabb2894a30f2b9043ca04562d2992ce9d5 SHA512 193f4da0d9511e3eea03f609cae48edc6d32e56bcbc1b16c81771fdc7d9d0412b4a3f15e50ee72f473aa0c5a5ea7ddf23de416e95d1405f3ccbb01845de49e3e
+DIST gentoo-kernel-6.6.60-1.arm64.gpkg.tar 241623040 BLAKE2B 1ccd6db504cf211ff90bea7c684409a5e9fbc8610d617a032759971a89acb6b002749a4af8893ab837acca9176e92ce700382340e9322d108a89a990b7bcb8e6 SHA512 14fd64094326a345c7e719fdb47c0472ebdbd71951dc01bd1a8b8fc1df84e7a950a078beeb23b40d8d4a0fd67ba564698ca915e7b90df7db5a96afd3b62154f8
+DIST gentoo-kernel-6.6.60-1.ppc64le.gpkg.tar 64327680 BLAKE2B 88bde51ef8247b2148b211e5048384f6c5c6af297d08d95dcf597ea6c94f9f654e5ec0cecf2289fcebd82635b9aa7c3b5329cc778692cebc8d1efc55248ee29c SHA512 d4bf58bd328ed881ec5df713f7ca003f2fa3ff9d7d3e2c42c7d71d723b99b33b1f25d1dc9a7342ba572596f25f01c375a483b1521ae883f0ee9d5a97a01ce4e2
+DIST gentoo-kernel-6.6.60-1.x86.gpkg.tar 68331520 BLAKE2B 2e3078d1fd08e7b8c4d21d2f465e7bd048176a97b23396b04da65b9388d1a6ee3223fcbbde87e866596546dd7ac60d1915fb0d70aa29ff15ce0663a15c109c7b SHA512 07f027490f45e770e2739577b42a521d61b43fa3b48cc8f7822440f1c59e18278ba7e506f6d88e953c9cea74150414e17a78e7397a87db7eba08060bfc00494e
 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.60.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.60.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.60.ebuild
@@ -0,0 +1,181 @@
+# 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##*.} + 8 ))
+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
+}