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

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

commit:     5afcaa2d9bcf729e3c8c335b5d48ec5837301c7d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 17:23:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 17:26:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5afcaa2d

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   7 +
 .../gentoo-kernel-bin-6.7.1.ebuild                 | 161 +++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index c645b4919659..dab3e28873d4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.6-15.base.tar.xz 705240 BLAKE2B 35353cfc627d8b2b71e0e117db8808
 DIST genpatches-6.6-15.extras.tar.xz 3704 BLAKE2B 4808b3b5295768d7d352ec902a53c010d0e76ac322d399114512704115884d3735e34f86793e7c9de596fe1ad0d104eaf979ba0ae442a3c83d0d6b27823e8458 SHA512 eedc4198cb08b2f7d6daa17c298822a4235495416d453419efff71fb6127119679fb271bb5aced58974e496a66e81764e3eb454a96a6e4dcf403545a45fefb0f
 DIST genpatches-6.6-16.base.tar.xz 750868 BLAKE2B 13af5286f51a69dd0ad7b2543bcf0d933865e14c4c865e495f3225a8740bd7579858cbbd72a2099333e8dc241900c166730d4c812183f2636bf3d4049156a71b SHA512 70864a69f8bdb28f8fa3515a33be510a2c529a5c3bc767aede2dae1c290869491d776336be9983259685af9fee2d2bc61c821d0103c47e91b69078bf81fe2c63
 DIST genpatches-6.6-16.extras.tar.xz 3704 BLAKE2B a33d9a80926abd8318f124fa6aa25f7181b88a6965c17908232ef2b866a27a5e856e464895994599265e0e57d8e1f81561758df4670f25ef5694e5d5f535ba95 SHA512 8ee1686a16886320b698ac0e3767804fc9bbaf595335203fb2899c727a0ca0f3e551ac13b3cbb97cec8d91e77257aa1da75669f1c41d263960875e9d31303b1a
+DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B 69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444 SHA512 5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
+DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c SHA512 43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
 DIST gentoo-kernel-5.10.205-1.amd64.gpkg.tar 63252480 BLAKE2B 52cf3967ac881aa557da92d11a021c2509b5e6920cb04be415c626bea66e08579481b61d6897d8e88fd830d18461e6c41423aea398fa1f00aed581300cc1403a SHA512 295945d6ca4ed5322918662531b353867522782f243aba54f3cbbe22b515059e54b40bf124020c1d8315c27a491d7af894a8331e1395f44c0d763297d36e58a2
 DIST gentoo-kernel-5.10.205-1.arm64.gpkg.tar 56729600 BLAKE2B 62ecf66572c0b5da944e3200f7b0d1ba3e12231e66c5e90b1415becb0fd80d49da34b57fa5d20898f7c0085be25edc9ba939daa400e7587d6ac9836ede944f94 SHA512 5b5530f160b7119a200a4fb7c247aeff76055e92be92289d02be37f886dc522c076a19013d518df348f5fe352c758343c6ad61d7b0a819609f8020e2321de6e1
 DIST gentoo-kernel-5.10.205-1.ppc64le.gpkg.tar 52879360 BLAKE2B 2ba47d25e79ad05473f8ae87c08039bd858daf5d67ba6746f01bc57b6f7515a76e91c34fec101d514e81caf4a4103f65be43a4351a5c509056fd53da98f0da8e SHA512 4817b60666808ed734d84f2bb0f2e2c051d3a908eb24c70ef8607536d3aff782925aa231bb0d8180e53224cdf30c426643ff375e7b3f5f047d50411eddf6d178
@@ -106,7 +108,12 @@ DIST gentoo-kernel-6.6.9-1.amd64.gpkg.tar 145643520 BLAKE2B ceae9156ae6c37c45b01
 DIST gentoo-kernel-6.6.9-1.arm64.gpkg.tar 118558720 BLAKE2B 170d7f90400b9bdc0d4e98f7871d4f7622c670bac8baefd77ce531a11acfbb34e5ce4c4fe727918009b2980985c6c8d5d15d1859f2e129762c68efba3d3a621b SHA512 e7e56d77eb5391579fa1e8b5a6ced2c383e53c56b4079578f14a0ad5364405fc2e0088c6ab0851e5f8eb461912bec0b3d377560cf551b35cab3039ba750f76ff
 DIST gentoo-kernel-6.6.9-1.ppc64le.gpkg.tar 64337920 BLAKE2B 93a44b217ad4a3d7c1ce253554238e5d04da795f3eaf1c94fd44294eefe1c56130bda61985ce759dbc98f851c7da910934a777046f22984b6521867db6d69a05 SHA512 1d55ac1965e86783a290437bb654d727899a19d3953d428097fc9b169bb732227d8042ceadde85449278aaa323dff8827bf751c520cbbc8f36c7c742298d486b
 DIST gentoo-kernel-6.6.9-1.x86.gpkg.tar 68259840 BLAKE2B 86c05ed50692df9fae4daefc0448970f34b52c940db70803c6e8b259f12d9bdc1e8539f6d8b7c92886c19e9d84e6a20072c6d4f7b284cc9a0e0bbd67b30cfe9d SHA512 157a67acbbd6f5731b31fba5861316aab90ba9d9254bb4623582c15d45508eaed7903af56b64fe7c3fbebbd28c4b6b3d6f3670b952b84e2fa2ac1260f1fef509
+DIST gentoo-kernel-6.7.1-1.amd64.gpkg.tar 148244480 BLAKE2B 331554d8368fbf7e066e57859875dc04bfed10e1b7d937ef149af894214e6a0350f43f8c3b87fc3590e01f7eab3c5b94fe03a5632bb606fc435a0f63fe06fda2 SHA512 c6e5f6646669e390b06db010ab2e30a803a3d15b7f898b45c565cc58426161f4c9f12529e8d7beedec57c153de0cd9c1a73c25099c5c75a0ab66e2730ce12f51
+DIST gentoo-kernel-6.7.1-1.arm64.gpkg.tar 120647680 BLAKE2B 1ec1a5470c5f97bfa12e4e90ee58aa057c96a120ad8acd0fe62f858f8b685ac19f0759e76bf6d435243aa1b9d3dcdee4457b05eef2e2839b6d3589b38269dfab SHA512 35d41bf8df7fb65f8838c74d55afe005028af686859833e4bec8a86b061a804e48a425b77f222c3551188ccbd7b51b75491f5a13b69dd895cec9fc6405d59316
+DIST gentoo-kernel-6.7.1-1.ppc64le.gpkg.tar 65484800 BLAKE2B c0dc567e77b591a0d93a94d2f9f07f091f48ea5dee481d47dccd7b148617be56cb38d6f89da010bfe344eab0f396f556221a9e6df54a1353c4fd6cbfb9dba4f7 SHA512 04cf5db20c604999aed94e9bf3d69b546b6247a9ca68cd1bc187b52ef82b4c890538d5aaa976ba596224b2850e63505ae3fbab8f569e7f0c030569469e6ee302
+DIST gentoo-kernel-6.7.1-1.x86.gpkg.tar 69447680 BLAKE2B 9a9aca80ff60e42a5e872d4adfbf4e9271d4d7512270387635374a548ddec54a3e168bbbadc5e6c8cc7bc237cebbc22d41adb665a0c025f36663b429a5bb06a7 SHA512 c458b99b01c04bddf5fa816595b53cdc36c4a71b897a3434764f424b631f23670caf555ee3ef1b247b7293cb115568ca96ebe10c1b5fcac2892a4c49d47f8bcc
 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
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
+DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild
new file mode 100644
index 000000000000..44d02e88809f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild
@@ -0,0 +1,161 @@
+# 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##*.} + 2 ))
+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
+
+	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
+}