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

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

commit:     5f5e10139ec7fb63b250abd5a2475ab8862746ab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 17:17:55 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 18:12:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5e1013

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 06a666efaf71..1d9af689d5f8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B c1a730341ca150f9f698300f59f43d
 DIST genpatches-6.9-11.extras.tar.xz 4052 BLAKE2B 3b12fe75ae76ff17e30bb30d5e5cb913e31732bf43958b972356772e76d892823b925e715d9e777dc3ca39f89c01960b8d420d2647775d1e4406e4b82ef2c08b SHA512 5fb378ce92f4d443ce162cd69771d6b9d150bb7be01e776c22cb913437c7b441a4474dcb33fe7d6d3f285ff0f8605b7aabd9149594d0e45ef8b231e3703ed026
 DIST genpatches-6.9-12.base.tar.xz 683040 BLAKE2B 4a87ff8941e75ef372616a5d705bddd62b9c4d305f6806463cefbcd8b21ce5ceee587e875c7ed6b2be9c239635bf59c532290af71700a6d651873cdf21d5e539 SHA512 dcd0a956248c9c3cf7a978e35ab8304569005fa4b688491a6b3a73d4ed32f3fbd0b4389a8aecb5649a39b6b3a603baa74c9be7b1ad1aed6a016f57f9a00408ef
 DIST genpatches-6.9-12.extras.tar.xz 4056 BLAKE2B cbcee5bdc1567abc3b7b546607b0c7f59c48b58deebf24e2ee1141f4181b19d05cb5a3b799d5d7e1619f6708ee7083f96d2f581b74104d910150c53f5248559a SHA512 c7016f5dd9b1be70c80439b5f5f651731e193991a7551304daa5628bf296546d94378e74193b98d695f7d4860f952ac200a67342321dde8075c028e6a5701c21
+DIST genpatches-6.9-13.base.tar.xz 688596 BLAKE2B 4d999aac191dbde56dbb6feae3d328d2e33f4731b7f9f6853bcd7e7f47e73dcb182e64b41c05e3035fade78ad02157a4fadc7e2e7e0d6a0a4bba5ff49b071adb SHA512 d9347755a75a5c34dee79cbf3eb012f7c3b669510c9fe1d87035ac36073139e9e22ca55cedf2bbda5cd493026637d266ea227473c9a3c6f402c0f0c41b9e3579
+DIST genpatches-6.9-13.extras.tar.xz 4060 BLAKE2B 001215e8ff494a0daf42306c4f2301e477c4135a8817b4b0c2abe7bf6894c570e7bfcf8454d1db1703a52ab77b5d54dd6fcdcef72fc1a3e9730f238996830dd5 SHA512 9cbaa56e9d2dc20915d6831f73903ecefbc1361e56d27cf71df36db87b648643cb974cdea1ab96426a6eeec710259755fb58ec285425c6b7ba44f2a42bb5549e
 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
 DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29 SHA512 955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa
 DIST gentoo-kernel-5.10.220-1.amd64.gpkg.tar 63283200 BLAKE2B abfa4447a66dbade52e79edebe0bf1fe6d9be7a3ae6eef0510b45b19ca6f209dd46ad8426defb9935ef10485d8704634dc45d411c2760a92af8692ba16f3d34d SHA512 8ee2d79de3c54036d4302ac542438c73132f88a803c56159c96a4fce63fb6208a299ac3310aba5ca30c3fa504f71a60ce365a06c867d884e2da104ea57cf2eb5
@@ -134,6 +136,10 @@ DIST gentoo-kernel-6.9.11-1.amd64.gpkg.tar 159375360 BLAKE2B c9bd176abc9c7dc938d
 DIST gentoo-kernel-6.9.11-1.arm64.gpkg.tar 130088960 BLAKE2B 9f723e93aaf392c6d601023695b54f48a386a4410465722c516a41940b398e4f31fdc99a609ba92859efe149b66f51e25fad601c119ad27b54051b4f5430ef39 SHA512 8b4961cb6955fe5609340771c2b275d36a060ced8fdd522b9eb52b60cbcc671a2b40e6921fc19bca24e1dc15e5215500acfcae6b7e5b497711a414113afad69a
 DIST gentoo-kernel-6.9.11-1.ppc64le.gpkg.tar 70758400 BLAKE2B e342bb4a241093e773f766b8863a68b97c94d1859a34509ff0c3a1cf4b192ad9a3455ea05b2381736188465787bd0d6fcff04a8151e6e48adf6adff85a88f98b SHA512 12d858cd5dfcd879a552179f8891b892aae095e1c5844e36ed58597b15ec6e91ca62ba378d778dce21e0ad859ae19d8e71c9e7887fadee7a937d00af2d1d23f1
 DIST gentoo-kernel-6.9.11-1.x86.gpkg.tar 74905600 BLAKE2B f86a47b277355201b37869ef1965f1aca187d1c5358555fc97379bd4475484f6261c86532863326620475a30de72bda97ad97ecd9fd00a4dd9f8ceaf8983be03 SHA512 70cf83968c84161ac7428fe904584ce6b9057bec4560ee10d922d42cc2b2275d9d22372306eeed703003af0dbe8e82949d68c8a24394f264bf9ed1da7a3db4ce
+DIST gentoo-kernel-6.9.12-1.amd64.gpkg.tar 159344640 BLAKE2B 2813711339693d69c081b681505cba7f48021442e78a867bc30dd4a83cac5d5604be8ca44f06ec60f529742bb8d893a7658bbb0e60551d22199e362cbbf54ecc SHA512 a6d8baf60021bd0a5d6b250bc9dfa4b1f760c6da9fb6c7090ea2affbf128ac1e221d36df4fc78abacf772ab361b4f074c1c958b413bf89db962581aea2ecf461
+DIST gentoo-kernel-6.9.12-1.arm64.gpkg.tar 130109440 BLAKE2B acd4a998c1942d1ac823a58e9e280e10e9478513c80cfb89d7ba1919cdb42685b0ddd870b0e726d755fd4a97b90442a20bf36e9f89a397cabe9cab9f2c66abf1 SHA512 567e4e3c7b877af9f78bf4e2fa1a788552ef5ce7f135815588c6a71048de15da84d50e837cfa56065439dca4ccaeb2343517758ef973ecbf34178696a2961fb6
+DIST gentoo-kernel-6.9.12-1.ppc64le.gpkg.tar 70737920 BLAKE2B 5ece241bfbca2a15c541eaa70286edca15e1d1edce49056a48337710d33a60cbdde79aba916a0b0ad0a7dba38d6c2e76cc9d3eb1317b8d8b8aa6af15b5e6bb59 SHA512 7a37f738a488f4842e7c11827264f5ef8645c2b996db247a436d8310a74c692755b35aff8e4c33f73b79e5290ae78ed00da98667c2f7bc132237dbb89e512983
+DIST gentoo-kernel-6.9.12-1.x86.gpkg.tar 74895360 BLAKE2B aec063d251a5f5ae847c58cf7621df98102cf5852d485fd5cfed6b8040453a5b369a04f61547d29f6b7dbbbaa6ee7c1a490861c21e17550451df9d191002baf1 SHA512 1aa39f8c860044d319e22c11ae13e14372b6e810f447d60e226eeba8c5c0d585b6413929482e440ae6532e677ad5858121370739c107a0e0ab68ddec0fb35e43
 DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B f54c76780fdec033d8ce5b419dfb8cb1d9fd36af80791532ec7d6bf5ac4472f1fff6f52151aca93cebf3f99ba569b990a850403a99b56d427b6a48a32350b735 SHA512 ddf33e3b2d19a1beadbf6e578a70f363e2fac965dc19c2fcaf4a73b768f27611c86f1c3ec2a472fe37376fcdfece48a53846ff3ca554c97d4eb9686055c1a758
 DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B 7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7 SHA512 b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad
 DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B 782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a SHA512 923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8

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