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

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 cf62f8bf8c8c..41a0687c794e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -46,6 +46,8 @@ DIST genpatches-6.6-74.base.tar.xz 4055280 BLAKE2B 448044e3dd03bc4fdf50e99985b5d
 DIST genpatches-6.6-74.extras.tar.xz 4056 BLAKE2B b706064bb40312b20005f2fc3d1f364789d8ab94c6b6893517098dfbfc18f9f51a5336ba492133f28f87daaeb5bd714dd4720b4cdcd2e50f60c0df330a6d23c6 SHA512 a113206e1c5cca4177b537a68b496721e6f51473967ee690e7a1301b285b73a1a1bd279f8df6c8c53b5fce1b2e7220e2d0e473bbcf2698f9993b1284fdc26721
 DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
+DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B 643510f5f01b8b7ac5c24098cd65b21ef02fd75b2682b371b00e8be48c6c335e7135569c58ad91ab6549e298b1dca15b83806143bf260a9e594feeffb2178fc5 SHA512 1345c21e33f3f0433691e03921c7b3d47bfdaad47376c06610170cf82214e3648cbbd2cb250ea4877d5c238f324f499b52e50dd2e5b51b4e336f2a1a5a431a1e
+DIST genpatches-6.6-76.extras.tar.xz 4056 BLAKE2B 51631e3f138ac1f5146bc8d70f3381ad64e8341336cb1d706b2b3f838c6b5e884a1c60745bebf73ea25ae7ec26ec049d76db7e260593b3e7a4795b98d4488734 SHA512 fdff2ce695891603f3b9bd6b3a44df526559f454edde20e5159c9e53d73fc9820eba1836ef81b22da9d3adf7906fda16e9b6e6a3df65bff56519c40dad56ccc5
 DIST gentoo-kernel-5.10.230-1.amd64.gpkg.tar 63324160 BLAKE2B 62af76878c2adad51cbdfa4f7fe6b508ac77d58490c807b8d800e971a6c60d32a0f6d8478bfb6d3a167e118d8a928a4da5c338a00d4bab3fae59a391d4a74cc3 SHA512 5a8eed28b0e8d49d5a45a4aca5e11c5f39eda93ed854fd9237c3cd6b90a511bc0426383b0a65293d6a5910bcbd27e67a26626e7df6844ee41797de527e2d2144
 DIST gentoo-kernel-5.10.230-1.arm64.gpkg.tar 56780800 BLAKE2B 5e294f0fc44a4df76c251be2232b85ec94a613bf59a116b7753373532d7d45f845809df0d379108ac6c75a8ecf290da47abbb574453a5595a05fcfc3d143fa0b SHA512 ecaac1adf2e5727edf3d1a0dc4c3cbbebc9fb6f8d574749c8a2c2bca7b0a57b6d66d4f28b9ee7378052cab4e7f671affd7f24d777f978b55396470ee071fe842
 DIST gentoo-kernel-5.10.230-1.ppc64le.gpkg.tar 52797440 BLAKE2B da3ae36a895bf2b8135098be61b6b1712dda4ad0ce241306b65d877bf48494f71d84ac209895dc73054846e23623c77144fdfdc6cfdc43cec9516f0be78c125e SHA512 b352e0e7df9e1ac907b840348b3c341be45a0dabbd539ddd89bac158c11517164414c73f528c7c9a0a5b6c92404045e1e41ca906a393ff1e2ae8d17f0e6422d4
@@ -142,6 +144,10 @@ DIST gentoo-kernel-6.6.67-1.amd64.gpkg.tar 267724800 BLAKE2B c38c7d1a3f3cf59afc3
 DIST gentoo-kernel-6.6.67-1.arm64.gpkg.tar 242319360 BLAKE2B df01eddbaf3d31b91b87bad4372ebf8f46a5a27bd0646593c9a7961b95561479dec4950c25e5a4cbcea4ea1e2be895a7f95d383f87593d7a4fc65f3cdd0fef3a SHA512 6067d6649e7e5253142b5416ddf8daf3087552f33895d2bf273cae7fbbfae26689c7d02231df6926d35caf3e8dc941aac28031f044cd9bba93f7349ac7874575
 DIST gentoo-kernel-6.6.67-1.ppc64le.gpkg.tar 64399360 BLAKE2B 12f72a9b32eaede365570266c84a0342bff045d599952797c902dcd8f0cc22bd64e89b3f89f29945f2c8f10a88f802e7bfa5988cdd42160a5b61131923a792fa SHA512 44ec739e47cfdc56c452b12182953942940edfcda069af413d21b51ca93b2f45712e949af9e24b336743ee0b55db9d658856df8e59aa9bb348075a342848452a
 DIST gentoo-kernel-6.6.67-1.x86.gpkg.tar 68536320 BLAKE2B bb06e87f36f8bf561eb508dad24771191b24e125e8389f5950d34ed86cebda125e7efd627996118f1f720ca0bcfbde61ba63a282eca8cbf0e34a5e195d05ff3d SHA512 bddf4efb828f770ddbad7175a5e1ba6d73ee166625e1a1db02e76ec16c045083cd75bbe738799713ab18eb2c2074f1e39e8df25711be55554e0f29d994829d69
+DIST gentoo-kernel-6.6.68-1.amd64.gpkg.tar 267837440 BLAKE2B 739f981f2d04c9ee5c73eec63ac61ad30ef3cca381161555735d2111b59ea9da2c44515d5b3aefcebdc7b390171f1668f79d170bfbd62e98382866254ec0d670 SHA512 557a9a9c332eb4f8583917bb364fc171af31e48080f99c41f5e095c7445c7b72a01c1c3725b87fbf5bfbf95fa6c5b8ae3a0ac7e51e8f8a769b18a0f87611ecf3
+DIST gentoo-kernel-6.6.68-1.arm64.gpkg.tar 242391040 BLAKE2B afa95daf6586db7aaca1f76c8db57590b6046edd3f130f4b5ff56d87b6f5e63a8487969f46e3c6caf03d655332e7f547a9c38cbf0d26f92d8901e2c243017d84 SHA512 1bcd6e1b868fff20f4c85658b683796573f8c33b1cddeb367456cb1f6ffa38cc1c03a025ae078031f3768ac6158029aa8971aced6345089b4070064b4ba0d7d9
+DIST gentoo-kernel-6.6.68-1.ppc64le.gpkg.tar 64399360 BLAKE2B 89f8c4095d6348058c03675b905b1484ddb058e6f8329b9b06fb9c9e3082fb5f48f0d32d1618a3c591d1ac0f81cb135139314f9797a9b19d8d93f0ed30dbc8f0 SHA512 0fce07afd3d590d63e54cb2adac5ffbce6d7053c2339245ff85b8e1efa5008094cad896b946a8b39f49d9dc1a5346a60ceea23128170d1562ddc3a5c12d63560
+DIST gentoo-kernel-6.6.68-1.x86.gpkg.tar 68546560 BLAKE2B 632080048137222a79feb436ba8d82e0ac94d8c2d9d5e60c44fc3e68e53ab1e42c1e6d3f8858688e9b72824eb76e24ff1f8b1d1b119c78678a9264819c29d07d SHA512 ee350fd348a4493200ce61567b8dca79bc4ddfca8292d794e7429c26620f08ac66f7fc06145becab5fb0d32415aba1b10f3c19d3046b024d1785b1cd62485346
 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.68.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.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
+}