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

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

commit:     a21c8544d490d0ca5f467e6c68714167540f81cf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 21:16:45 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 21:17:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21c8544

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 373ef3d01e69..ddf95edf2746 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7b
 DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
 DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f
 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-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
@@ -124,6 +126,10 @@ DIST gentoo-kernel-6.7.7-1.amd64.gpkg.tar 148705280 BLAKE2B 099bc78e0a68cb438035
 DIST gentoo-kernel-6.7.7-1.arm64.gpkg.tar 121241600 BLAKE2B 7aad2f676326330076f7db038860c1f32b89342a33b8c187dc2593e5d43d3268e2617f147aea74bc05e29f7140a9bc49afbad74e39bdf17bbf0e166b1bc48299 SHA512 6d674bc5d31d3c906bd2b5cfba88e0c8b35f8f845c22c1687afcd17bb281de468e238d617a494d285460b7d4e1a11e45b99a41eaded07d28d9fe4f65728b2be0
 DIST gentoo-kernel-6.7.7-1.ppc64le.gpkg.tar 65515520 BLAKE2B 65e637c502d32ac0ddc86cd6ad0991e74e7a52e15936871d4e5111de9be733ad2e40398c205b380c02a724202d61360c6f4b80afca4a559d19adca67acf6a47a SHA512 89b1f18d2070050c5a65d55203000320d10b4fdaa0540930015170735e8f5c3e18db6d8ce7db44e946792852075f5025fdf882a593f7aa9a28c292ae710c4b53
 DIST gentoo-kernel-6.7.7-1.x86.gpkg.tar 69509120 BLAKE2B 230342429743cde159fed517d91781829b68e84a9a013e23f564ded689da5086f81eac651398a91fb04dc231801f4d2d6f170902dd4f006a21e6af9eef907665 SHA512 ef97285c2573e3e07ea285f8b9738c3d9c5b823ed4a0c47ec54907278653e9252302d93e75fae0fc5f27e90055c94320dc5a0b6a8912b6b228869a394b49f599
+DIST gentoo-kernel-6.7.9-1.amd64.gpkg.tar 148766720 BLAKE2B f38f75bb591f0963627ecb263b2bad1fb0ca10f036f28240ae97d85c73e3b124c66ed64d76e2fd13882807f424b28809f569d1a409a3cd0c82179e71e28156fb SHA512 b84a5033aef8065f71ac234caea63b4c42093412559483842f7aa1217480d0073d2cb6579905b250d933cdad76f7f80ea6693f42381079c88ca8e84ca9b91a0b
+DIST gentoo-kernel-6.7.9-1.arm64.gpkg.tar 121262080 BLAKE2B d02c1233b54060eb3af7f44b1fbaeeb400ff43c1b2ddeb0aaa7baefd3dea6ef56e8fd63d6b4c9403245766faa0558bf243b3d728dc89d7dd50eea5c9c4ed496b SHA512 a2da18d45ec6bd897ff65caa4432665ad2b16aa8e66a95c8af76e79c9127f37c2fc354be188353ab7837186ab96a46a784badcd3306b4e866457d0bf23f5d304
+DIST gentoo-kernel-6.7.9-1.ppc64le.gpkg.tar 65536000 BLAKE2B 5a6bb590d7e7ba39551b0d6c3e8bcd59f26dd5e90979ac314cf155e04b6c3d8a6df2438739502031aca25c01ee9ff9562eca433c39f5369eac493d1a8239ae5a SHA512 a5cfbdc1c5ab1d5c482745bd2396dd36a3673021d34ede22df569ecf6e2f24b34ba38331322be70475dea63698c34a7e4440f88eea09ed70b386c917d951e721
+DIST gentoo-kernel-6.7.9-1.x86.gpkg.tar 69488640 BLAKE2B c85f8200210f29cb55a5319d1adb6ec27f5605af629d04efb63fbf8694e756c37f6e005d6b2a48bb050059b085e06f3e5c9b1c43733c1273b292a4e8942f79c8 SHA512 f9b75efd5e7397e2427f6a0f382ed657cd30c4c0cad34a2ed911218475ec29cc22a8f30bf8214ccb7279c01c7b37b7c7f1726a685c84447cd9e4d2d0e8eac60d
 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.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.9.ebuild
new file mode 100644
index 000000000000..b73e3912b990
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.9.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
+}