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

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

commit:     7e0795ecedf0a39baa00c2df8a3928a790404580
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 08:22:30 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:29:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0795ec

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1c3f99033358..0eb22616e9de 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -48,6 +48,8 @@ DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e48
 DIST genpatches-6.7-11.extras.tar.xz 3704 BLAKE2B 1afd454ba83299605a573405732f41eda7a261f8cf524bfdaf329b4130849b0ff0895d39902360e3e4351fbf5ff1aeb2e378372d556bdf3c90b330a2195a7c89 SHA512 9d5b52bc1853f5cc41bc762ec023037ec25f22e13f1b098f7e7493b29645cdfbea14ebbac291330ae61a7c1a9b5f8291b7b2f88f61690cfe00a129693b98d035
 DIST genpatches-6.7-13.base.tar.xz 742864 BLAKE2B 63b5326788da244f61d76327c346ec64e7916eb4e6163a4ec7a94f4c51a5ce4fe0a75a58a781f4536811897226213c5ec85dc93b7b63d8d7ca81a0edb8724a98 SHA512 2d283438c2c9c7fec82107455949f6e525d34cd0542cf28594773f1dabc7061034579d71dda4e386f63cf8cd7d7921070a9cdd59c6478077ef87cb4b8064b431
 DIST genpatches-6.7-13.extras.tar.xz 3704 BLAKE2B 3a8af901c0e76fa3fe36d9dea4e8f7d034553c705f608c365cc7d50050b45e5c13b6ff530cd63ffa51054fcc0fa20d9fa45680f24063d73773f1ca407a81e395 SHA512 201a6724e62e6abfe110a6051c5d73e1fcedddba37220916631dcdd470bf3414dd3b6d499058bbf288f8fdc9e87d7a01a667412815521d8489773d17db9a5c67
+DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6 SHA512 eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622
+DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
 DIST genpatches-6.7-9.base.tar.xz 503176 BLAKE2B 420c8e40d2abc26201b50197f3cf32f8a3cd2e3d49013e60b215fe567089e88bfeeac8bba1f8d95724c51dc1e72af86ea18c9b5f35133046f9f77059f0de3bb5 SHA512 23b636e3ab4bd81c509533cf76f96b7e5b10d4d9dfe57b5bb162d53991eab57043f3b935882e7643e1f1db39de4e18143785d0f65c65ed71e9b546a147dae4c6
 DIST genpatches-6.7-9.extras.tar.xz 3700 BLAKE2B a535ebb75c26ea320af3ee4523d48c479e38acced934c09e6dd027df2c1ec281c8520d953b238b4a88c1ada82b5fadb77e7ddcade3ee112f50e1ae7b3eff5a79 SHA512 91dd0e05b3b14422d65752e6995858b68b75d155e498b89280cac776f29ef7805c74b9e46505a16d7644cf94b789cba7adf2bf18b453e93122c8c361ee22afcd
 DIST gentoo-kernel-5.10.209-1.amd64.gpkg.tar 63272960 BLAKE2B 66fba0e3b83fad66c87a2ab9d5c5a01641e54b48cfd7102264ee49597000888223bc5ec9e6c1a4af75ac0b05ed5e0565eaf1646b6ffd5aea39ceb9cc6a69ad3f SHA512 8d605ea4daad4c1fdcc472a7fc50320f87cc118d8d92a8fe1c3b8bc6dc45c6b8a6de312df4c13405042a3c1426d51ad62fc20ebd04efa0368a3d2061bd02b942
@@ -138,6 +140,10 @@ DIST gentoo-kernel-6.6.22-1.amd64.gpkg.tar 147240960 BLAKE2B bf7141a2e71fbddf528
 DIST gentoo-kernel-6.6.22-1.arm64.gpkg.tar 119234560 BLAKE2B 2c940875e0b75b2ba373de0b334f826c501f0eb572eae3095187c3999cd0f64b749f2e8b64ef06e9804d2d90c67aa418420ba2f88c316ee6680245362cde7beb SHA512 bb2116948b0343f51a380bc7ca4e04e7ad2aed8c89fe178ec1a6074ecfd5861b6c3c2a6990d47d8db503c2a4f4aa4bfe8f4bdeb38f1498d1a9aecdc850cfad44
 DIST gentoo-kernel-6.6.22-1.ppc64le.gpkg.tar 64389120 BLAKE2B 5afff380977b5021f48ca368321d33948144d68b03293b85aaa6ee5ed7d2aad86f62f563b898b7ba341dfef5667c3f9ab8d39dd0d4930193a65107a9331f67b1 SHA512 8d4c1135ec6c9b18752fa45a131f03e01fc5aecee73639f83a1e984cc395afb4c1426eb7d3275450eb15b2774735368e65cb17718258660ed6c9df86e5069217
 DIST gentoo-kernel-6.6.22-1.x86.gpkg.tar 68352000 BLAKE2B 01d9036c758e8cd45c3bd54a9cd88d326e110f8209ca14908723a71e21ce676b392d3343ee5a0ce8a62f5d94bf8ed4967bdf0fcd1947632d5eb0da1bda4c22d7 SHA512 7c344350332e53f2140cff466873f56154b190da38f3fcba35b1ec6bcf451371d22c61ddf4473fc52d4ab905b0188e5d61fcfbb96ab6d8cf847191651d6fa216
+DIST gentoo-kernel-6.7.10-1.amd64.gpkg.tar 149401600 BLAKE2B 943b7f5a49ccf2b15dc97f7287aafb6fe9f0100e17de98610630049ba0ce0d1251153bb19cdb1227f21d502c5a7fe3652b88eaa4db6339707517d219ebc687a3 SHA512 a5e17b08097706ce0d43e3182c75529d8a7007e13c501b7409c9079f1e560010604108f8ed07f47374585a9c3b1c455c4e9ffa96eb0d1cbcbed6704b694a1d2b
+DIST gentoo-kernel-6.7.10-1.arm64.gpkg.tar 121231360 BLAKE2B 6b1d5f9cb7850d8dc9e8df63d2bedf4593e56d6658e4992c57fa77352547f2db8a27ad489df30ead11275e4681c7b19a8655d55a2304f4b62e3957edd1795673 SHA512 65ca057f02a791cc9b5929640525decd5a378d8ab5f5f34c048adc59be32c59e425398ae7d69a2efb36a1cb15deb43f87db4f4a3086007bf8d19f56914607278
+DIST gentoo-kernel-6.7.10-1.ppc64le.gpkg.tar 65536000 BLAKE2B 72b1f773ea421332d95a119a96146f0ac18268a852de43e6ffc8bd018c432689243a8f04fbe8588b670e566c574bb396bdc975ca25a45ab58e6eec63e8c2ea7a SHA512 25312e14fd2a8c31a71f6697bce9443cd46bb45e7b3bacb601971b0f6ff53c4e1c40aaba259f8c6099ed44b944f3509607cc48637ef430f373ba06ea0d7a5b3b
+DIST gentoo-kernel-6.7.10-1.x86.gpkg.tar 69498880 BLAKE2B f8e5f5676377ce0880479707a473e7cabafcdafcd62b8a874c22c73c15e7924eedd0bfc6dc4530ef92b331354cf36f482d0169c792825581edbd195a4f4aa9ea SHA512 afb970cbf592e7e1aa897646e950b9bd93b4042e4baa910f57bd4a72002db09dbcbe85eb3ab177aa89f10ca2db3c54edc7adf8f329dbbe6b6216874dc55569b4
 DIST gentoo-kernel-6.7.5-1.amd64.gpkg.tar 148234240 BLAKE2B 1501a044d3bed23c6b9ef4088b8c4624c3202fa0f7725bd5f7b7a9ab5a1dddd9d1e971fdece4ccc7ba4f9c27ed171bd969eab2871ffdbd7689c8e23831e78fff SHA512 c8a62137008761faf84e25fa31aa9c6617fe75d104e140f8551d5d91058a7e63e5cc334bb2bbcafb7cd9828f91f79d9c3088d11c05e97fcb53d42b6f000dab52
 DIST gentoo-kernel-6.7.5-1.arm64.gpkg.tar 120791040 BLAKE2B 0d5936029886ba799f2f628b15a9fb0e29a132037fee6e4ae61c3eb9ab13608892279009cd6c65ea671bcda2efa922d29a2b4d1b1c689584e960503d47f388e9 SHA512 cc07a66a06388bcf5e777d121fee416c2e6ef85b0bca11d3554a4d74bba00898e08f7c0948696da42f46542d0e4092a8bdcc117404f3d7ab01ccf8bf52c0b671
 DIST gentoo-kernel-6.7.5-1.ppc64le.gpkg.tar 65525760 BLAKE2B d33a320750728def46329b189c45ee15836b012616090414946dc6a1e8d676cefa33d094bdbc2c881502b95af9f1d9e0128e530962b855fa89730079272b8e96 SHA512 0320e5a2394d590cb519eb8ea97c2cd89d7eda9a35a1b9b33ee472705d44d60498a4483d20cf5048254e3adccfe77a3934e20e960d49cdc47079f6d7d5359f35

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