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

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

commit:     d893a32334066332e0aac38f234a95ea59f6ad97
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 15:50:48 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 15:51:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d893a323

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index eb19c9bd79b7..91b87bd621fd 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.6-47.base.tar.xz 2606912 BLAKE2B 9ab2547e43d9d17ce67824dbb5eac
 DIST genpatches-6.6-47.extras.tar.xz 4052 BLAKE2B 8cb744f165c0ebb88d4a8eb097c6f45c550d6eb984fa06902980c7276863fb6b5b7c1e760a9f6904f58178977f7e10a12626a20f83df4a2121379a26d1182ca7 SHA512 9f7c53624e9ca9bad3f36a114b3da3aa5d3c1a7c92bfb85d862814900303a58d2a6280a9ab9a0c3f342930a1354b579e94cf5eecbb379d31c7666925c1ae9cfd
 DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07 SHA512 2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853
 DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f SHA512 9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
+DIST genpatches-6.6-49.base.tar.xz 2664860 BLAKE2B b6117aea15e733852794addb703b28f26a8d9afbffc8d576ca11f272d00627e8254c039565221db39a1bbaf9010eaefe9608e9c2906219c78508f301eae7cb93 SHA512 d87482a0667a4578235366951704b8408c1f2ff91c2f2c823dab0302a85c0ca007a9c0acef17a4c231dd3d14c1392e3b18d9816f72ddf9afe54ade8613075d8d
+DIST genpatches-6.6-49.extras.tar.xz 4060 BLAKE2B 4a63f3dcfd864b303a90247bb34de3071ec3f8be751df06e0c42e48ed3299939aa2b58a64669d091adc751cb8cb296f98d17cd421e263f7da22997e9fde3f2ae SHA512 518eb6d8e295919db80748c07bcc59300eea0a0961d71e8618de9fa4371d6266e51d437521c183014ba92a35f1408c53306f5b7c6d82dd0e644209b1b73c12db
 DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
 DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770 SHA512 e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758
@@ -108,6 +110,10 @@ DIST gentoo-kernel-6.6.41-1.amd64.gpkg.tar 147558400 BLAKE2B 1aa15d95efadf52bdce
 DIST gentoo-kernel-6.6.41-1.arm64.gpkg.tar 119552000 BLAKE2B 7d2599490de2ab79bf36aa02eb72b99395864b9248daef0bee2b4389e524e1a53bca3fcf8a0c27d42f9fa91b9b6dc8dea0b49dd7a299c0583dfd020ea61eb783 SHA512 fe602fa4c7a5443be43adf3f35b0402288b86ec8d6d93e8ae9c0dddce0ed6226a4a0ac5993023de47937a6d9b929e9b2887d1ad6b2cf0b2421923890113d7e91
 DIST gentoo-kernel-6.6.41-1.ppc64le.gpkg.tar 64245760 BLAKE2B 1e4da6cb6d5af1c25a0880eb430eb457d7eca0e4948e1959afafc7d83264b158b7cc6627d1b4b6121a3a99754395f6ce3c72b24dbb1f98e15eba81b1b8b76ab0 SHA512 0e4010371fb78a301fb5a9dbdcb626ffd867782a2a699077b20a8eb44fe68dde69f20f6f20f7125f3d5a0194072dd7b0d578ec1f743884df543e60c6ed0145fa
 DIST gentoo-kernel-6.6.41-1.x86.gpkg.tar 68270080 BLAKE2B 828528fa4fca0ef09270f17fdf01732249eaf40bca261c7af06f5e08de9227cd591abc80d1f283855869fc7d640a3cb2a268c371c8c4bd969b7bbdcf77951583 SHA512 62afa7b9241a93ef73a33f9de1dd2554286b13cb7f1cf3e6e8d78ed38bccabecbf67f60f1c592af7c3ba3764bf21305020f436f2c408bd16dbd44001c9d93d3d
+DIST gentoo-kernel-6.6.42-1.amd64.gpkg.tar 147568640 BLAKE2B 474304044b39a82c02f4da965e116774f3cc6e2569fb69c497814204f64ed91ea3b6d56817391e9913cb75c992aed3adc42ef76651aac7e107ef654e5c2d6708 SHA512 a7b4f2efbaefa03bf30cb7126d17dc3862eb382d888a0f0f422379b1753df01dd49c00d10949dd437d015a51cdb286dc3318a2d5225bf15e2a2b01b1027d71d5
+DIST gentoo-kernel-6.6.42-1.arm64.gpkg.tar 119592960 BLAKE2B 71a6244f25e967b75093511d0ee7c44da44f6677ad4f407f051f5d2e005535e7c90326a82e3b39c7c0c927a2431ec09b994edd6278ff6c69d9d1f2c7719601d4 SHA512 4d5068ffe55d5a259e5fa01d9e36ab4fdd4e2e7a181a43679e9dbd92f98f3c4977665572b72c272748851bef29c1e6a69f73093f2b5a8749d4e2d9e2d9231f1c
+DIST gentoo-kernel-6.6.42-1.ppc64le.gpkg.tar 64235520 BLAKE2B 6d9f6e6ce30bdd96b43d3d69a06bdf72ecebd45f45a1f3de32f465617129feb7a316fc911ebcfd940ec2df8fdb1f4e07b827c33b5b5def03e5d95c55e2449a58 SHA512 47b25ccde3b3147ebbf00ed40924e37c42831635d87187ff5ed3afd7a053dccaaf9b0fc98d257fd5627c5e9d7612ec270b15b17c26557f4dbc807216ef1f36c2
+DIST gentoo-kernel-6.6.42-1.x86.gpkg.tar 68259840 BLAKE2B 8f78873a8784bf65984cffec338372ce122e9e79233b74a5ecc308237c9526311ed1629f02868e65fd6849e127c7e38ccab6998b5e490b368a7b64f81ab80ed1 SHA512 0e7b7e61c28a2dc90bde0c746727d41eb22aa3ae30a1ed17f77598f0864f71fe66c71299969873838eba1208dab38e48808119db27d67d09e3400b3fbf5cc401
 DIST gentoo-kernel-6.9.10-1.amd64.gpkg.tar 159416320 BLAKE2B 2d335be253e2313e6de88cf64a21a8ff76418729f481dd67b8b3fc69bab8986cd4780e2a17a4422550c75318b02598bad0ddd704d238122d594621f5abd9e3e7 SHA512 52e918b4cbdd085461a09e73b887712a918f41da081331ad53dc57225933537cc72afd870adf411201b9ac4df49a500bc65479c507305ef2bbf8e714c7883f08
 DIST gentoo-kernel-6.9.10-1.arm64.gpkg.tar 130068480 BLAKE2B eb1455d1a444a45db4c7148c61c2be13bcfc6d723683e311a1ccba50ab0beef1f5b93f207717b25e0e1c74020ba6daa1d2c42cc70ff983038eb9ba1628567a9d SHA512 a075ff588892e965ad3c1ff18cf770fa38da7ecf2769526b518088881ea1fab406ab77b5a40aa3e5c1925748fa91d3d2d1a4a8fc99df02aa711c3e5e8b371319
 DIST gentoo-kernel-6.9.10-1.ppc64le.gpkg.tar 70748160 BLAKE2B b3d09062b5ddf3eabff8ca1e1844eb445dd2a7a910356fb8799c38b000c7cbde64f259bf09ff6fcf6bd0b49d2ad87c9faa54581f27505dc7dd4c4f3cbfdcdb4f SHA512 41b46556727e57f325e204763cc98eab0627e0bbb00eb7dd054aa9718e61fea49293ba0f858b3f47e723e914b08c0f3785892e02b6d9e9abad1119fdac758bcc

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.42.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.42.ebuild
new file mode 100644
index 000000000000..e0e46cd48882
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.42.ebuild
@@ -0,0 +1,164 @@
+# 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 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)"
+		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)"
+
+		# 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
+}