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

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

commit:     b8915f67e20b945f204636a8c3a3f2f4004d09be
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 14:06:41 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 14:14:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8915f67

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.7.2.ebuild                 | 161 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8c7d99386e41..6c786fc73fe4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.6-17.base.tar.xz 894152 BLAKE2B ff9c821916d3b1350ac30a44673eee
 DIST genpatches-6.6-17.extras.tar.xz 3704 BLAKE2B d85a68fe7bf6e4693a41958a053705e35b8829c236b8fad024f7332f89be277708dce2bc931c013b3bf51e14e3b11162342893b7d257541677b17efa918c86b7 SHA512 d53c369e9f54f6de450a41882626d74b22315b8ca7c7b381089b77a6b1b5a1b444109e8fc9c25bdf22afeb92af252c963c700e0e309cfa272caf39c1f5855a55
 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 genpatches-6.7-4.base.tar.xz 193776 BLAKE2B d0b6ee8e055d0c3b8122e1050818b49600a94c8b1b06ee4b6209d89207d527fc6c65352c728e359ad2830830ff25079a2d6d6ef6a55ecf60e43887c16673376f SHA512 5cc15425a7e9e80320f0b18b891d2efa2dfab4090441003b3c617d820c7e449a792aa266941bde0d22ba26e9a6999e42c3b686b270bc00389047678dd71b93d0
+DIST genpatches-6.7-4.extras.tar.xz 3704 BLAKE2B bf9fe3be461e9a5e7ebe59704bf22a418b67644345728b494ce3b725c03902d7cc226a32cc46c831afbb07e0111d397556b9f12c63871a8f173d7fe136acb2f0 SHA512 70e91002ba6b48fb9161a1f28279f29636e381a34b67856bb492fa36edbce68ae8aed48f50df5e7a14c59f1f8fa4e74ab9430b7cf762a5dd3feee08952213f69
 DIST gentoo-kernel-5.10.208-1.amd64.gpkg.tar 63252480 BLAKE2B 659253d258d12ae26473b9a3ad2b8e2ca9f481447870f290dca411f473db81ccde43c35b86590c0df563870c8d75496a4b2bd0918224f0f36a04a960be4b28a5 SHA512 d251deb2cfe021e477489f471bbe9c41c098416eb4b3c148c51e790be075b661a9db4264c3d6125352a7ac325bb0b982f8b650859c34fc48f61464851a7ab750
 DIST gentoo-kernel-5.10.208-1.arm64.gpkg.tar 56729600 BLAKE2B 3a57808162fac71ccf1f9539d268680f384476b1c497b573be141da8a48c68299562bf206813a0e35ad097b426fa70a14956b3ac474117e7eab227cf3f780230 SHA512 18beb0123749b717a21438f26aefb49298e392e57b517a7be6012d484d6dd80968d87d78d0c48cefd2edf45885d691ecfc2cfbc86481188c296d4afc6187b975
 DIST gentoo-kernel-5.10.208-1.ppc64le.gpkg.tar 52879360 BLAKE2B 34db7f65b4213a245e96716aa74af9fc2bafb67647f76681abde762c72a3b4c1d4b8dc8c98e3a5fed51ddc6c49baf6473a8717fcd596d4e2ebcc9aee4df8ded1 SHA512 c0704b57a4de8bcbfa04f683ff5155ba022774ec22d8ef7dc65bd14db574e95648ea67a5340f7c979d57c14bcc779fe1a53007da249c8d6b251230fa9f04af98
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.7.1-1.amd64.gpkg.tar 148244480 BLAKE2B 331554d8368fbf7e066e
 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 gentoo-kernel-6.7.2-1.amd64.gpkg.tar 148234240 BLAKE2B 6a6bba15615213dace9bf7bf5eca91a8858180574606c9d1af25b5453b1ffdfcf1975b2e20a5486cde94e48ae2d56afab33212ee97ee8bcb6160c83867d4d5e0 SHA512 138894f1473df1569446580da421a1181f4100b907edf8f16b87a9462bee345a9bcb3c35ab94db016b5b3832fcac9f7059b55cf3a56ca6342f050511c3d8e9a8
+DIST gentoo-kernel-6.7.2-1.arm64.gpkg.tar 120760320 BLAKE2B bb928c929e5d17696a724595c6c247c4c6b9dae11c3bc4aceb720409de6046db10a017b3e38630ee1839fee8459243ead620fd8e4440a39ba298f07c32a7b9e1 SHA512 8d0d67025cbcf1dfad98afc46e150880e7ad1e3b4b21c129dc5cda766852bcb52f3bc7a74a606c1e529ad4c83a37d8f65254f678c12dac2731013275c1ca8c15
+DIST gentoo-kernel-6.7.2-1.ppc64le.gpkg.tar 65505280 BLAKE2B d306a1570272d9c8df6adc0f06cfd8e63e1d318f95ef2c11bfb750e37fb4b3cce42c124758a6963161f4bf17c08059c7b8621baae2e9d31f393ad8a12d1a8c57 SHA512 f8777ab4c09c9ae5d0e81092cc70b5266fd4454586432c983b56c10135afb3d6812cf446d23fa5deb64a8d7616ee01babd05dd312b88a2f6dd915da083ba01a9
+DIST gentoo-kernel-6.7.2-1.x86.gpkg.tar 69478400 BLAKE2B 61961a9071bffa0a3c0bee9529f7443dd0f41cb0abbe37e539df6f5915fb46ae412238c1e6cab4cbdbeaa4eee77e2edd513e976f523f28f77dc96f38fe1f14aa SHA512 e2a287cbb47db3fd7ff49b1d6676ecb42f1587e1946c3980cc2d13652d3390a0fe445d695630d65571e974a32f72431d2d8c05109073522dd0ad8d3d1710735f
 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.7.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.2.ebuild
new file mode 100644
index 000000000000..44d02e88809f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.2.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
+}