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

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

commit:     89fcefc5760d78d968993f6b57779619bb8ecde2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 15:07:24 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:10:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89fcefc5

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.9.7.ebuild                 | 164 +++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0b375736ba9a..7d9d7cd9e880 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.9-6.base.tar.xz 319896 BLAKE2B 8b58a70db0844a8455fb413de046cf0
 DIST genpatches-6.9-6.extras.tar.xz 4052 BLAKE2B cf761f7035971e6f2be6ac719048fba08f203b2f400bd7fbb62e4e10bb7d5c508dc7e79f85812ccd1ee1cbc791c4f19a6becab2dbdfd4ad2c3ec2b1ce0f2bb47 SHA512 fbdd60a92f8dbafb30dfdd65b3e0c03cf274dbb148c092f40dfc2bdd4e5d7d18f68c9064bf0419e7dff5c94c67fba3922bb474ec717dda8094b37ab489cfc8bc
 DIST genpatches-6.9-7.base.tar.xz 406988 BLAKE2B 066ce941f4338903a9f54071b34215dd16401d7e00e471615ea4b55cc5da7c8b312bb4c5224398c5348a76fdd4f1c6c5fe97213b913cc397ca92ecd1c33a8d86 SHA512 0175ff3df86d76b926efae0b15aa4addf2192d8b38f80a23e930c669a6a2453847d358383f2d61ccbc0c0b2e6e155a62bccbb4408b96c1ad3fb56eeaffbb1365
 DIST genpatches-6.9-7.extras.tar.xz 4048 BLAKE2B 06ddd8d1443bbc4833040250b872d1949489fe14b0b4567c6c484d6bd6972a465ce0563c37a5272de1cd4ae66bd7711b1bf413b0a04b52bc00b9e549154b97fa SHA512 b74f2aa4050b06d7e5b588c87638470f92c45d26b3ffe7a16db43b487fc6460ec4e7037b81120a87608e773a63cbed678d4368b7d0399b841711fb63b1744f99
+DIST genpatches-6.9-8.base.tar.xz 488932 BLAKE2B f8ec56d444df32d1e5fd922dfb4ad64429f2af2b5660a017b02d862452751282982ec354bc70b06072943b1dc3786adfb78bbfe70e5e366f98f3565c065d81ec SHA512 f0df3b5407c48415f76e3738a07f22fdd0fc168302cddd46d63c4057013e585c19c94ee7d9d418ae9eab2dc5597f58bdf4e78ec6f05e80217acfa7a119c9f5ce
+DIST genpatches-6.9-8.extras.tar.xz 4052 BLAKE2B 6ef3193ca251ed0d707df368a55f98b2bf6e7b165cc03da9dcc122a96462eeccbd70c7e349402387dfe5cdf41e6ab9caeacc18d6c40d13e1a274828e910fa17a SHA512 f4a023f4d754de5bbce85affd0ca4636a89e129d298a0d81bc256632c9cb9886119ad6c1bd0c3703a2fb38b316ab52c11c7585d0d8a8991eb54e662c38d217f5
 DIST gentoo-kernel-5.10.218-1.amd64.gpkg.tar 63262720 BLAKE2B 0c5bdf6c3a6f1841751ea3efdbd51e16862aa73d3fad5015cbdb6993ad47daa89f770597b09f28e2250f5f22aecda041abac37a99d06b797fb27997a33f64c96 SHA512 fcc67d5a76267351c550e56cc61bf59a9a3557d148c6cec6919953ba7b18f45d36d1a3a8532d4da1cdaa608f29024f9fba32d27bde16665658f2ba0d13656bb3
 DIST gentoo-kernel-5.10.218-1.arm64.gpkg.tar 56719360 BLAKE2B c114300a4f17b91277ce90026c2141acc0729547a3511ea0df5071532b13a6c06c87853917280debdb7753927442c2414baeb363fa83dd74077a5708ceee1da8 SHA512 5468341ac80b5d0638ad38cc82a1dccfeedfbf1727c6bf852e8aa8a9b51750022358c4e32a483473293288ca9728ed9c0839a78e989571844dc823394cdad19d
 DIST gentoo-kernel-5.10.218-1.ppc64le.gpkg.tar 52869120 BLAKE2B 27cb1b7f85bee962218b8a6635fa6639cf2c1e04c3809042abaefa1b766dabc7bef06c5e83022d0d1958cce9dfc97bcc615623e98c3c2200aa1ed9bc8d112250 SHA512 f36d649ba33eb2745463325991a5ed0e665f6ab12dc8e13572cb8dbfe5fe2c24e00bdc7246d78891cfb43129d51ea6ccf39f42c270765dbd8050f3cdc8254cec
@@ -94,6 +96,10 @@ DIST gentoo-kernel-6.9.6-1.amd64.gpkg.tar 158976000 BLAKE2B b6986cb27a5784c19989
 DIST gentoo-kernel-6.9.6-1.arm64.gpkg.tar 129751040 BLAKE2B 37f565d5d17b16013931ac88a913d379c9c946e615267b51ba9ae2f321c493f526a8666773d4853730c31aaf475ec6dcdf67fcee35b93cebf2f861f75643a550 SHA512 62b4d011409028748a33e6172a8fe612f308bff4474dfe3ce907de4d8b2afbb41e29a63dcca97ea2ac45b5064b8d45b9ed0d1c63c63a2fc0f7d40dce222d0a69
 DIST gentoo-kernel-6.9.6-1.ppc64le.gpkg.tar 70737920 BLAKE2B eeb7f7d134dae7627181ccfca39579c2faeb0ae1c681589ad422293c9c134310337227e55af03926e6bd63993b699cebf9653e70b5c531bb8f2ffee511079b81 SHA512 f785ab94d666d7b2ca14502f1d18ae1d7ab7905dba7fc14fb8f0c54dd55ebdd8138583674406a82a21e09a2e7b0e24f4148e05d017226c5fba20c6ea964a3fc1
 DIST gentoo-kernel-6.9.6-1.x86.gpkg.tar 74905600 BLAKE2B ae14dd62039dda8326e4e2aebad7723a82280e8c5f0ccf97af764c854750b4f79c61b63fd6e61a872db4415e4c5c8a3dfa6a6a254ed7ccc90d1bd036313641ea SHA512 55547ae6265d47514face363a4c7f3ca866b14f4022534b9dab1ba31144c2de6a15efc146837a7c1b43c4bacc72dc17ae13ad87e0f53a53809694369995abff6
+DIST gentoo-kernel-6.9.7-1.amd64.gpkg.tar 159006720 BLAKE2B 79ee096029e6caf2dcebc6bbcd016033c04acb5382387282b3906aa5dc587539ac632749318c855686a288fc66d1ade40a3839991f9b79f9d3037d003fe3e4bd SHA512 63455494647ec92470047306a985a57362d893a335d09f65d60f69c4f6446625d88a4a4c33c015ab28a30bfc7e90d6eb36c04e7dea9c1d224f6b0c654a0e98b5
+DIST gentoo-kernel-6.9.7-1.arm64.gpkg.tar 129751040 BLAKE2B 8800ceb6b5a99ffe81f518a39f263205415b882e891aa56b4fa34817a65ebd510a087aa7c10c64aba7179e793ccaa865baca8af9d485fd0f81aafb80da29e911 SHA512 4604a6cf7abc7a6206f718c453a396480a2ed8a552c9f4474a05336354f60f089b792effe9834343778b1b2cc12578ff5d71247aef15d17b7ed8e57d6ed1ca92
+DIST gentoo-kernel-6.9.7-1.ppc64le.gpkg.tar 70717440 BLAKE2B 039eab7e466cdaa89c1fc5e819f4709c760b871aadc3febb5b5c62672bf41f29a99b6654c54ccd2f0973dc0e41c77e8628de6d004972243ad55900b943805ca0 SHA512 52148575a90cf5b0eb2f2506fd4c9ba0253515c9dbff55046b0dc8222b9d1cbf8918ee8ad93098cbe1ec70462b831ac0aa68ca7995b67467443528f122f5b7b1
+DIST gentoo-kernel-6.9.7-1.x86.gpkg.tar 74895360 BLAKE2B 277358a6a81c55bbf3bbd5c4e53e2fe127f1d30b87321093ecc2a9f275816eec65ad9b29321c0d9bc3dea6afb118c3019d68b634c940ba4fc082eb24382360ed SHA512 16146179fc0b113f83b9f5f63cf423d528e72f2ba9a76885c7d4ebf787f6f376b23e165c8dff900c13fa09ecde9043b34a67e3ce5385ed980bf0f6f07f9ce21e
 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.9.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.7.ebuild
new file mode 100644
index 000000000000..1503fa4fb5d1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.7.ebuild
@@ -0,0 +1,164 @@
+# 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##*.} + 1 ))
+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/-2/-1}.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
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	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
+}