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

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

commit:     cf452864fdebe72857ad135ac0ba4e88e1e5f8f4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 17:41:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 17:44:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf452864

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index d379df327887..da8cc9aa9bb0 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804
 DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
 DIST genpatches-6.7-15.base.tar.xz 971400 BLAKE2B fc87e6e218c0c26051b83545f82a491a83df9b0e324f1f659329b144a81aa21ac6e90532ab080eafc99b7f87b9d8ac6aca84b043653cd09b8c41b7e34e52a9b7 SHA512 3c62c11bd8de96e86dd7224bab00103fabf5dab58c2d5d6ab2c27302802eb3d5fcd9370ab8c209f4a62a8f2d290107edbba72bf9dd8d78760c15234989aec5d8
 DIST genpatches-6.7-15.extras.tar.xz 3708 BLAKE2B 8ed59cf05b758ec9341f6e8488338ddcb60e70cb1d25e39718cfdca425d47e7d5a7cbe4575da631363c89d263bdc65cbc8db718550f0f0978647891a6dd3677d SHA512 b01ec4dff86934dfe5686df4fde1b9d5534b156d127451f3bbb1267df8f3f7d67d11a496df3896d6b5777476cc704578b00c8fb124176216467b5bc4e184c9e2
+DIST genpatches-6.7-16.base.tar.xz 1101836 BLAKE2B f85c1bdbb8fc2a33fd231a23cc2b4f55454aed62d44b42878aa071b27898ad68dfaa0c72fc6eec944a7c08bd8b6a0854107c30badbf355fc68fb46c30c1c8bd2 SHA512 31518e149408da3e604a1ab9d7591f9fc0042fe8162f8220cb124dff30ba7cae5150769596c494cd76667a6f5ef849c78f19c61d89e7363289f91e2651c4b688
+DIST genpatches-6.7-16.extras.tar.xz 3704 BLAKE2B 659050195f491f15579b2261b6c2631de5d5e4b4d2088fca124511ccd71a9ac62da7ab1f4bf08846bb061c033ec087faa5f6a783334528c543d17d72cd8b340d SHA512 d867a7d95e388b384519b27910f521b4d6305cf2673136f543ddc0b2bcd066d4c726448c413aa358ce0ea3a2abb1639a2fe54d31c92cdb93bdaf76c2155b369f
 DIST genpatches-6.8-3.base.tar.xz 250824 BLAKE2B 2dd35057816341b1dbdc9fc651b2cd8f2600d11026cd73168e32adf59d08c93f932adec3ab3e00b24852e565e058054503a09278fcadb9f3ac6c640bf4972e58 SHA512 c5cd4b802009128f3b3a637551f35c678800054c75bc1e09738f957428b7087b93d88ba89f65ecfc5d71b89e0c9004c2024edfec7ab36612fb214ff5ca5b225c
 DIST genpatches-6.8-3.extras.tar.xz 3712 BLAKE2B 1477adb78ce367d923717752d92ceeae28cdebf82484d30b3d4b46ecb308dd6418b67bab000f37312a129aa4453910ee88db1d1f84a9e943b1edaf90d15d20ec SHA512 bc1ea41091c8a8d093652332c6c11ce727730c7b922b457e6935ac1a20905ad9c4bd8757812feee50315ab7658e388e6bb292fdda4b6f03edc1ee184b1db76f2
 DIST gentoo-kernel-5.10.212-1.amd64.gpkg.tar 63252480 BLAKE2B 3ce492216591a8c99b136e3baa7588a412917ff84dba8db91eb9d25c314b109f83009d646ed95c08a8af7a429f8a746ed824f5e6db679777cb19cf07ccef095e SHA512 dd29113f7409ce3d71df2354cd015be6c4943e13a7ffdd1609367f418aceb3eb6aa1687f9bfed20796b230dec1ed27b7bfa4c00398d3b65fa6109dee790a136c
@@ -96,6 +98,10 @@ DIST gentoo-kernel-6.7.11-1.amd64.gpkg.tar 149442560 BLAKE2B c6175a3b91b93291e24
 DIST gentoo-kernel-6.7.11-1.arm64.gpkg.tar 121231360 BLAKE2B 59753e9dff475c7ec56b9e84125d34d2155649b776726f661b560e1836799f53ad59bd4af86542ed600079129753eec998eec71197db252eeaab64916107b8ad SHA512 96143b5e24f726812144a757c9170e472211a754a2213d3910b9e536001ffe33c58f170348a66ebface0f9cdb368f30d633ae286962976f0c9c56179aad75425
 DIST gentoo-kernel-6.7.11-1.ppc64le.gpkg.tar 65536000 BLAKE2B 4d950b3f819ef6e5ebb02e782d042fa2682c393722e9584cd4d41e18b6b0c916dca540cbd563db538f1855c4fc7755eba61a6437c80284f6f6883008a1cd833f SHA512 15e27d1fd28347606668bef5eeaa5f5302e2c9b131805016a53a5ea89100e3fb11bd4c2f1d7946f15c83818e42e993d712b75351213d3931df264e56cc6bbd9f
 DIST gentoo-kernel-6.7.11-1.x86.gpkg.tar 69509120 BLAKE2B 10b6b0a673faf54df6f852aada102541747688d8611a5295cdcb4de045dbbc6f49260b3965d49ba3e913872fb7c76d19f18a4dce01b544b2336000214b2d3ec3 SHA512 99afa32fa6f1ebb8fc7661f5995524a1b7426f2544302c72b8f048ae060479a457cc258465a85eba42b7ca248cd05d06639664f4d4b28aedb73e19504916feb0
+DIST gentoo-kernel-6.7.12-1.amd64.gpkg.tar 149422080 BLAKE2B 9e248ee45bab7b2d958dbafeadeca73c169d4260e50c2b8205c50a17e427b6e1d1271a796d34c0d00fd6ff2609439e12d9f32a3a463fbaad988c54a271505e72 SHA512 517af47b1b226891367ffa95cf80b5e3688197c1a25431021b752dfca9652fda9d6ce12e0d4b69af7d60d40aa76996b5f1387d2b99094654e0f0c2723a2831bc
+DIST gentoo-kernel-6.7.12-1.arm64.gpkg.tar 121251840 BLAKE2B a39ea71ab095086c6e45d230cf42eef7d62b65b03bcea8fa20ad7cf2dafa37d53de6449090799a40ef303d0d5506f551246c9d7c22e87a1c5338dbf3e2cba790 SHA512 bf0ba134ffec8c0452cfafd91f3cf1e3995f2f4a5d882531630ef9d0dd556ecbeedc1ba426ef7df7f039371703ffbb60a40e66c63600e152124eb5718dd0f765
+DIST gentoo-kernel-6.7.12-1.ppc64le.gpkg.tar 65525760 BLAKE2B 195799ff422da8a8aef5d53cc23ebfb579fbb62cbef7cf7c73ca6321cab2fde47f60a71aa8b0cb26a33fe7d2dfa426713d6663192ba6a709d0948ca2dd2055f6 SHA512 fca58339dda5874739f5c91b5f63b16c9ed8cf144315ecc15e859fdf14795dc2f4aa662aa696ded2d4a0b6d045a3503306da1b7e6473de3c9157169c3512d8c1
+DIST gentoo-kernel-6.7.12-1.x86.gpkg.tar 69519360 BLAKE2B b4f34036a79a53a7fc1bb7cb123eba583236ec939cc076e8f59618493eb016da03c28970dd3dbda07ce9f4d6ea0f355e2a8a5a4a15101feb542c382d7a9240d3 SHA512 deb3f3d77270f4f204c64ff5491e99111fcd8393ffd5aede4c9453b30d77bd247a597dd4170dd8ca6ae5ed4a1262f9392edfdf5ca505968140e6b793d1c336c8
 DIST gentoo-kernel-6.8.2-1.amd64.gpkg.tar 150753280 BLAKE2B 46792a78448da3b21585fcf231e40b501e7850fe8ef21b083ca441287da534420a905aacc1998ca18e35ec859545f35b99f7394f1a3863dca48d45d78ca0effc SHA512 971317dafeea52e37c9cc74b90d5d8565aa39b3416409d0cab6932300812796384544f5556f8c3b696a9f14911810e4122531eb24fa1cb6c03078ab4daa8839c
 DIST gentoo-kernel-6.8.2-1.arm64.gpkg.tar 122347520 BLAKE2B 2f527f69c20f810c0e49c0e4953e5034c127801fde66e5146b2c6a959ab17041cc26cee86d7d23053feeedb009d9f270f99757a1a0060f8ea4720d3b6f9c1b39 SHA512 d840fb365b0f1749beae1bc034ebab6db664d5f5b9fbf74907ae2f93d3cc71176a19cb0257234e52d5c2ef2b87421a4f445f636eb7149c51f48505aaace92446
 DIST gentoo-kernel-6.8.2-1.ppc64le.gpkg.tar 66263040 BLAKE2B d4884d943e937cb01d59def78dcc386fd7e163aeaba079e4383e6505df3e0b1b57785c44e2502e46cafc7c2c25aeeda0236f2c42c2e9153b814afff3d200c177 SHA512 23336bc1a6770dd9048e47bec33b4fddfb8a26bf1267b3fd8dd0d78e96595533a377348a8d8a1ddda28b0562341372713debd7f12bac05ff3ae804a2c11b7951

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.12.ebuild
new file mode 100644
index 000000000000..b73e3912b990
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.12.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##*.} + 4 ))
+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
+}