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

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

commit:     a0772f8d82b4e8e5e966cb8730f9e0af8e4b926c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 17:32:01 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 17:34:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0772f8d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8f22348dabe3..1bdab69866da 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1c
 DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91
 DIST genpatches-6.6-40.base.tar.xz 2364536 BLAKE2B 53bf04c020921c8d0c2e7ff8466db4cf5078ac8985e95b5b94c5fe9e824747d66344acd5d8675c42364704dc34268cd636fe10bcb02b657cac889ea8d0b4ae48 SHA512 c5852fc2db474fcf697818cec947cfcce0dcff834c57c042c42321889839d94c26d1994dfc275e64e0acba3055c90f0f0cc4e2a07c80a71a71f3ba99f6093401
 DIST genpatches-6.6-40.extras.tar.xz 4052 BLAKE2B e3e882483caa9222b702b1387c1cd5a1888b6466611b3dca23f9368f423040f27006c8889e477a4ef52719213433e4ad6187322e80ea236ff390aa306b4a5e33 SHA512 509bfb18a8218c6a7eec28543cad0db44b5a693c50465dfda09b92dd176a5102c3c2fd064a7426c0b33d4acd1dd58b77483babcd44389999bbfbc5757cd0fac9
+DIST genpatches-6.6-41.base.tar.xz 2399184 BLAKE2B 5765835d442a0afe00be3070b1780107331959538c7a9a7b7d8107e9c9bd563b0dc25f031db926ae3b24f2ea4126d1c8e29837e5993f647896ca6ed620158274 SHA512 7601b25d287627373f69628de865658305471f428ba20bd41d9e2cc3762e2ee4648675f899843ea6c4b6b68c108cd3a5d049bae249ddfc089f2988ee69ed1491
+DIST genpatches-6.6-41.extras.tar.xz 4052 BLAKE2B a3ed97dd21f02f8b5a8b2e315b9581780310177da774123c7cfdb30c13485e1ec8379b57e10749e3abbd1860f7e52a5111ac5f63250d015e9aec5e64386d4571 SHA512 39932e2c61d1687ceb64698186551ac5e8c184f58e24692f6b22cde65644da5375c58f26dd7cb0e1bf5f21a737b6fcc6ffbd86372e5c055c8dd2ae001efcaf6c
 DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B cb961b8245eaa58405bf758f4432f1ad98b767d7f9ea8e45fb440bd2616e67c6e12cff6ec3af89748f19043c9b0b58b634e28e7bcdc469fcc4daf2f752b3a438 SHA512 60fb3290eabe8289fc4acb4f1df809ace44d7678188683b64ef2ec92edb8c2ac0d757280ebb63087145fd068e64619a3b0a9227fd5f3061099d287e8e8dd5720
 DIST genpatches-6.9-5.extras.tar.xz 4052 BLAKE2B e72e5a5195db42f38ed671899217d7609eb8a5d9f954ebbc36a53a88fcadd1cadecf7257b33a880661e949f2c7b176a5762ecc1e56be0195e6768d8be8ae5fc4 SHA512 3d9315afb5c45cf24f6e5287048d49f6969e49ba2c8f339d9f4da0f5a08708ffa65636c3d24efdcfd246f6d28c72535089078971e97f7aefeb75119a67cee11d
 DIST gentoo-kernel-5.10.218-1.amd64.gpkg.tar 63262720 BLAKE2B 0c5bdf6c3a6f1841751ea3efdbd51e16862aa73d3fad5015cbdb6993ad47daa89f770597b09f28e2250f5f22aecda041abac37a99d06b797fb27997a33f64c96 SHA512 fcc67d5a76267351c550e56cc61bf59a9a3557d148c6cec6919953ba7b18f45d36d1a3a8532d4da1cdaa608f29024f9fba32d27bde16665658f2ba0d13656bb3
@@ -54,6 +56,10 @@ DIST gentoo-kernel-6.6.33-1.amd64.gpkg.tar 147179520 BLAKE2B b7004beb54c76931ba2
 DIST gentoo-kernel-6.6.33-1.arm64.gpkg.tar 119193600 BLAKE2B b820c3641ee22c5ede1bbb43ba37897579e57bce0d94d020b21ff2fe5065d3cacf510dc2b840f622afd8e02d8da9b49cb72e8d0f38a1cf1dda66f9e0e5b47b84 SHA512 ecc7b33c1167475fa95b1254d5d01fcfd22502ff10cddb7426695179d99ffa5186e8831bfe6e0d04e114edcd6760adb5000223d26e115f205244bf0911a87e4e
 DIST gentoo-kernel-6.6.33-1.ppc64le.gpkg.tar 64245760 BLAKE2B 000c3c2744247634f2828bda97eec8b51108afa17cfb6caf3e369c883cde893e6d70ddf2a86bdbddcbc78128422c75bf39cbfa22a3c2b0d037e104823dda7393 SHA512 606df49c5b2ccfcc63e4635be65fdbd412fc2da0cd095ed529810f64e0698d40447ef51b4ea6ec540b94214f649c8821aee82a02e79da03bfbdfa15b7f3a7c38
 DIST gentoo-kernel-6.6.33-1.x86.gpkg.tar 68249600 BLAKE2B e56489eab7a5c7e523642d55a5e8d00e355d2a8d1829fbb401f8cbfc93ef83c795e6c6c1144f50ef9a052d0c0a04bbec10597d4dc5ab109754268686251dc0c8 SHA512 25e057f615073a94ded817365f3504bd2602adfa5b690a3738b60d5497c355302138dc6bbe4b323e936a999e6cb68e7a6c591fb8da00b61b3359ca97581c82c8
+DIST gentoo-kernel-6.6.34-1.amd64.gpkg.tar 147261440 BLAKE2B 8e6ed75198b4882ecfe837ea3be15c8cd425937c1f53a27293aacf6300261a1574582755b2f9bde6483140b24c3a18560edc56b6d2d36106a5de98aaa9421f9a SHA512 b4974e1bea97e295f3898f07afed38c898c4850632c59740841e47006fe29656c67d84fac15215d36ce1eca22ac100b4b3363f1f8e537ba4ebfd102293511534
+DIST gentoo-kernel-6.6.34-1.arm64.gpkg.tar 119203840 BLAKE2B fcfe329412c32e779cc6bc049d5cf1edb50af7582cd76300033a6295ba9fcaaab66548102b95475a1d4663463f8cacebb9779e8df9cc0f2b1b15826643682e25 SHA512 cffb4ba0ce3fe462c3954df016cfaf0f7878dd736518d4d21d2d60aa140c694840d56dd0bbe036acb64f7a46b3640fc086f06453cbdae4af9b66f3055a838d52
+DIST gentoo-kernel-6.6.34-1.ppc64le.gpkg.tar 64235520 BLAKE2B 1a3ab1bf89c10350a1825ce5b782f44beb6d5ea7f407fffba98d2f6155f68e5a8505a2e8ba9a86257dc98beae3804556b8f9d82636f5953deabb8af53e9780ea SHA512 a1462d44657d5808bc8b6249346f6cebf8d1007ff6b8eebdfd31050a02b5060e6b576dbb6251177d00d03e7865a85da273b44ce0b1f0908b348f81ecc9d7833c
+DIST gentoo-kernel-6.6.34-1.x86.gpkg.tar 68259840 BLAKE2B 7b2fd356724edbaf3a2ecd38bc05f03aa1213895cf43264e2574494f0265e5c99978a08c93b62a56d7f946c2fd00f1f42272c3609b3d83057b733286c5a8feb1 SHA512 3ea663d49deb2bd5661a64555dd13451c285f1f13c82c38ebd38fe79a05e86da397cf9d89d5c290c7628ac086528aa268d415efabebc6568b391b9656f73c5ce
 DIST gentoo-kernel-6.9.4-1.amd64.gpkg.tar 159006720 BLAKE2B 9e2189d7ea4546bf9d3a937ff0f3cd95929749931b4850a198c543b753a76e6e2305492fa4cd03ca3221c070107b6b1e76cee3eb5c066ca273d0b8b4b2f67efc SHA512 87b26e414a79051271531e6152b10ac11b6834983e9bd500056a4d95aead6efd2bcd45ec0456973cd464ee4b66349929e0db1cacbab50a7b8e30484293377166
 DIST gentoo-kernel-6.9.4-1.arm64.gpkg.tar 129740800 BLAKE2B aaffce5d2f922f53de6b4ebebd23ce2edf40731e79a325bf07502f0b61f440edf85d6551ac70f6d96f539ff3636091e7aeb478e74b7e45fc0adb5b8add5f31e9 SHA512 61ebb357a3a4d4cb80f90bdcb5e8ab02c810b1a39ca4aa95a2bb3be56e85435625c427f3ddf93313623e42ad81aac7a206c14eec60865ed7d661d1451779dfd8
 DIST gentoo-kernel-6.9.4-1.ppc64le.gpkg.tar 70737920 BLAKE2B 02097895e96decedf998bffaf2c442623e27c9a530c7f57dc6a6bbe7bc566142215d90a71055ea383e63d146d77cb4c3b0b3d017156f4f8f1cba22ad46bc2f0a SHA512 9057f864de4f15e7b1911f91e21cc71c888e95c26035ea3246e0f116d5a7817266ecea2e08cf1f9eb09bf41481be570034638ee1775f09e39901c599bd6b4d90

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