sys-kernel/gentoo-kernel-bin: Bump to 6.6.58-r2 (built from 6.6.58-r1)

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

2 files changed, 188 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 827617b2dcf6..beacc180cb33 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.6-63.base.tar.xz 3551092 BLAKE2B 8edca00c49096ef4682038389b19e
 DIST genpatches-6.6-63.extras.tar.xz 4056 BLAKE2B a7a361bfe180362510300753b3fea12bb0ec1014a3b7307211931193672db1216abf994ba8cb22cf365221202dd93f4b49fff6970c8eb88b7a77ef7bd02d1f12 SHA512 49574eac90eb749de544afaa7102163607bc24e2214ccc3c84cb6bf8f60773c45831da93bb5598aa4b933f65455228649afcba6d93107a81a666828b0919b18e
 DIST genpatches-6.6-64.base.tar.xz 3582172 BLAKE2B e607e40b069b41983d461bdf9e3d6cb1bf53f6bdedef80934da3feaf7760ecc01fe77ae76980351e56d3358cbca8ba514b83719a6943b3ad3582bc5e1f55f949 SHA512 c33db1d09741c996c3e63253e24cd06e0b1ddcd66c602007394c2f8bf1800d5144fe6f27643954b004057cd2056d8e353a5aa67456c1afbdb3aa23e540a45792
 DIST genpatches-6.6-64.extras.tar.xz 4060 BLAKE2B d91c7df7c970efbe0126a3e189daa71ac02259cf1746f432ac702af7991c04bf235c28ffb578ffb2250e92e2c475ecdadef97645b510606cb395e725dec348fa SHA512 c26f1c1446ccafb751bcb8d05a41d378ce670b8115ec79e1b9a21714a1275c75ca36b68424b17717cd5b75fc1421a132eff0fcc31f7f32bc192964f3c64a381c
+DIST genpatches-6.6-65.base.tar.xz 3582916 BLAKE2B 3d750c677e61c122144de989a55db6f04a2a545981858b71c602c156f802478ad19f4d87629760be724a9b522b377479df9f0c5f9a859235c5fc438df95c2aae SHA512 1ac5e7fb36e50227a6bdf035562f11401ef6a19c1a7af2d001d224b8710e3aa10434d828a3a0213a1f5cce101992bb803199e5d4e76474b657dc5c4d6328c385
+DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B 53cdbf5d680c9943d189e7606caa10c18bd3317789ffc1f120bf535255d80bfb5e3969fe952eb0da3c1001ee41e93755616332363465d4714a67a90140c43bfb SHA512 b5b3c817426be391a72633740beb4ba7b4e2546ee441081906d77ba31636321501af414140d487d284de325f80d004aefb241f3e349ef3ccd62d2c6fc4d7cf7e
 DIST gentoo-kernel-5.10.227-1.amd64.gpkg.tar 63313920 BLAKE2B 9e2645f93707b3e4b4d4ead1ba2ae546f5f49f377935a7056fcda9facb16f3ec56ac021e7884513a3647ac5acf3b4fc68a3e0a0fcad9da32c0647a85a83cb767 SHA512 d43a0163c40065fd161e97df64f355096c8d82b9b3b7636cf5eec0797f362cd0c5abe1ec773e3d8de77eac3331487ee7a40fccc685501927ba8d1bdb50cd0d88
 DIST gentoo-kernel-5.10.227-1.arm64.gpkg.tar 56760320 BLAKE2B 1f956977188a1c4de61be9dda6a82dfa5b4607c969f36d7330eac22d2591e9938e6fbbaece68bf1ffba0a4967c0d333acd0533e1c6b633dddcda9d0e8b967d96 SHA512 fcb3ee4dc4b3d795fed5e4fb588b64180e2b05d50d9d10e206cd776c3e4b2fb93aab1b0c377ef2e3ba3837c161216d9ee342a59f407196c92bddd37bae171a0e
 DIST gentoo-kernel-5.10.227-1.ppc64le.gpkg.tar 52797440 BLAKE2B daf733978a8062ef209f855bc919575efe5e87fcdda164fd75c5c3fa09c77c51d225aa4282c5900612789689c1850a1217d92da3cc2e23813c3e7fcd7e3f4631 SHA512 e1474a3406de968af183b246340890bfcb072b89cd838e982a7fe6790dafca124943279e18263851f56b46288b4acf7f96471e787c82bf0a98b34cf64abca023
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.6.58-1.amd64.gpkg.tar 264212480 BLAKE2B 3a88f2c0bee3fe46380
 DIST gentoo-kernel-6.6.58-1.arm64.gpkg.tar 241254400 BLAKE2B a18159f59314697b05ffd145d900f2d3c9a4311ba6ada234a835afcd76f30f79efb6b9f7809cd7ec61d4ebdc43e9eb6329ace3680947cd75107e65adec317388 SHA512 3097704edddafd69167ec49cdebe36aee4845758e577d0b64694900c142c116b815898997d0fe056c6a6905d5f582756e58fa50d4966ecbf10cb4dad4fe58aff
 DIST gentoo-kernel-6.6.58-1.ppc64le.gpkg.tar 64307200 BLAKE2B d8d863fab084e95523afdca0b9857e09aaad33e9ddd136df7d0a0bca2de9e602823dd9a80273dc64b8b757b4aa192ad2535c4e34b24a23c056fbdb4df4d2b086 SHA512 792a9e77b9b4fb6bcb14bf5b7321a3a39262aa1b7592affd8280bd3d57703e6014e12bacdcb30b8562b94bedd22df3a8a67a32e163301b19bffd29a7e49adc3e
 DIST gentoo-kernel-6.6.58-1.x86.gpkg.tar 68331520 BLAKE2B c87d6d152ac50dc346256fa2b6fca6812a9aa12ec2eab1e3408bf1afb31019843e18330f493aff63daad3a10b00dc2cfc302d70a5fc68869951353f999294df8 SHA512 49307d991f0c811219611fdd5fb2b26230af222908d6dc7fb528d3d1564a186d5a7c996355eaa768c382f2142b349fd1541178e6f4a9fbbe312795f361d71d60
+DIST gentoo-kernel-6.6.58-r1-1.amd64.gpkg.tar 264273920 BLAKE2B 537efe26fe31375d739bc5959e6b22b639e227d2a97d93693a3dbea2f40fec2ad64506462fd441fe07c1900bc304ac31ef9317782bbbf9b54fd17a8b81ccb678 SHA512 afc37b354b2d4d16f12545cf30d0d6f5dc2170f231166b0c608cd11f98148bfdda420cc7deff15f1b91c8368589967456ccda90b3c9b681c22b883507765a6f9
+DIST gentoo-kernel-6.6.58-r1-1.arm64.gpkg.tar 241244160 BLAKE2B 79de676d425cbe7eeee5a77f7953f283eaeeef665ecb0039e120c382225e8c1158f6695e86c868c7972b2150b988f16495e80b4fc402926900f8223f1a8d1cbf SHA512 e2cf875b6adc0a8325bfa0c328db82cbc483373917501c069646a5d052eb815390e8150d80bfebe83139a5726fa09264b41684cfdc03a1379d6b0cfb31d84e19
+DIST gentoo-kernel-6.6.58-r1-1.ppc64le.gpkg.tar 64296960 BLAKE2B d3e787f293b0b9f3944b3aec0fb1198c81b23faa5234d60962f93035d244f6a73db24a6fc893ae3de85dc4ce52ce4a9466bd8f2175d6f78876d4d4c65ce84d11 SHA512 f21f4b9ef6a11bb8ebdc7fed49439bdc41769fe8d6aad5dd6b33aacdec8cd185acc7264674fa4887f30e00785677d5738cd04f3699f6ad2063446cabee48be89
+DIST gentoo-kernel-6.6.58-r1-1.x86.gpkg.tar 68321280 BLAKE2B 754b2fa16df8508fb2db17d36d5be79535d9c1146d08c47bcac9fab626bf5abf47bb644c405e712b840ca93342c8c2d78f17dc6507e9d13f89d50fd583b1863c SHA512 e4133c9a68d3e81d418628c4e3b828b1cd9dd48f2755a489601b6136172ab0708c2deaf2b7f3c27d9c1b56d518a1b005701e905fd683fc8b3163dc6b820025e6
 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.58-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.58-r2.ebuild
new file mode 100644
index 000000000000..e15058aab787
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.58-r2.ebuild
@@ -0,0 +1,182 @@
+# 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 ))
+# XXX: Change this back after 6.6.58-r1
+BINPKG=${PN/-bin}-6.6.58-r1-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
+}