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

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

commit:     1dd1419167ecda45a90d8eb007c1a604737ad707
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 15:14:57 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 15:22:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd14191

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.11.3.ebuild                | 171 +++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3ab44fa43e59..04bbe712d80c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.10-16.base.tar.xz 973248 BLAKE2B f91a03c3d8c1f09a4c51f17eddcbe
 DIST genpatches-6.10-16.extras.tar.xz 4056 BLAKE2B 3a0dcfe962509bc0ab802688055d1f001b2508276f6860944c94d45e69cb9a453d9381f450f86dcf120ded7c161cc8714411d0bcb22edfc3ba1b78cab4ca21dc SHA512 a279b9fb36e66b5017ab142e71134d35097859f755c480a0ad3434d347ad5611b16b79f47a0f329a43aa3a8d4301279280212d76381d8bd45fe57fe1a6c2e9b7
 DIST genpatches-6.11-3.base.tar.xz 252308 BLAKE2B 4a410ef58fdaa2a24da1fef194cdc4db9c62c84fe8c02339c959cb0b4d679accfd9db2b013429b8a04ddc3248fc36d56004b7171d01df51376779906a2940803 SHA512 41e62846295d08672bf8d0a4b704c5578a7e4eb10712afe8757dab079730dba5a4a2e74f18e7c29cd4f971747bff5a595da707254c85b2070a2ec137a0374a56
 DIST genpatches-6.11-3.extras.tar.xz 4056 BLAKE2B 84e6bfed32549a2ee5752164a91cb4d01bb0ed4574af608a3a94fc7e78cc951398eb6404750b55368378c242286401382e8f2586d3a770bb6809bb92db085bf8 SHA512 a06ced9cdae186fed615fd42c70428ff025328800c15a1c52848fc4a52a456eb9d9c1158480269ca745eed03a8b91bb533867b46252d43b0a37673531c5b53bb
+DIST genpatches-6.11-4.base.tar.xz 429820 BLAKE2B 402166e1e2be81943dd191390608e1fed640c402c645b8a50784e9744aec0c5232ec3aa7b0a8c14a30936a98d415b768796ff8182ca23939c4469eb60165f81b SHA512 1654b813036688a97b514705fc43955930f080a2d0068a967d67d80587257270851f754ed4b7d98098e8ff0aadf1bea9ae025026b4a4848210b44d58b5041ed4
+DIST genpatches-6.11-4.extras.tar.xz 4060 BLAKE2B 90d2186c2aaf39cea7c5152196fdc6401350a2ec69e84ee0975449f296b9625260bd69c4660ac1e2dba5e912d2f6f1fe15e05dd639a5ac615aff65ca58ea1d5f SHA512 6fd9adca80bf0600a7c3701eedefed15b4429211ecd925bc9f8f7a07c8997f5e1fdc178c44c53a9c97ba4c568449a9b015b01a1eea1330d21160b114767d4fc8
 DIST genpatches-6.6-58.base.tar.xz 3154204 BLAKE2B 5b9456e93cb0984599e065fab0d05e40b7efbc8079763ede75ed7a6e7f0e241de96f0c6438cde52f64a5074f5bfcc5d55b5d3c21a9e9528138ea5c36e164ea58 SHA512 e775ac64564c201c3e1293d34a70f347a5afd5691a006d958f69959d2eea0af690cf66f7bdd450034ef9eb43daeccbedd58819dc688cd3e7e9933da9312cbf75
 DIST genpatches-6.6-58.extras.tar.xz 4060 BLAKE2B 7e16c5d713aaf221335b81f3a301e9bb1e7f243d9bc6739c3dd07bb3cfedbe6bd5a763ce418172c838fbd3de82909cabff7c2e5c4b4f1b675098b709ddc5203e SHA512 315bfdf633398b3b1a9650dae88fdd0c1442336cabe45a3f2722e968f510da13050657e8d35acf8a313981bd9403f5056abea182a0115a79952a2740ceb4ff88
 DIST genpatches-6.6-59.base.tar.xz 3174716 BLAKE2B 8eded8d4d4c343869f587ecc2a218d124c34618494ded9d17b493f26894e545658021ad9cfa05bafd14389de07406f43a722c37276cc14096a3a7a00040e2ae7 SHA512 88e5ef8de0954f349e5c0745adb8f718dcabcd2e166c597c9de753c892eaad42c936984279fde86974b307858959cdef401f92f6f62a98bf1d4bed14cbff821e
@@ -60,6 +62,10 @@ DIST gentoo-kernel-6.11.2-1.amd64.gpkg.tar 290437120 BLAKE2B ab05d92452ffe85d6d4
 DIST gentoo-kernel-6.11.2-1.arm64.gpkg.tar 266506240 BLAKE2B 4307c1a177cf7f6c04c160ac32126d8f01068b7c164e50d222f958e8b0d5bb6a01f6144e43fb796e736ff6cedb1aac1718b969a1acc1cc653d051c8797eb8f48 SHA512 9187854b7eaeca1ae65b42122e0d572d418bce8f37a12015c500f365094adfe853cc8d933300799b2a34705bed1cb5854532550e5d6c1a22befc02a8d9e90c9f
 DIST gentoo-kernel-6.11.2-1.ppc64le.gpkg.tar 164065280 BLAKE2B 0e0ac3e089058e89c5b0d8a211d1e0c640d9e8f9c31de78dff0ac1e430960adc887bb1b68e60d47008ae157ddd9995fd5b31644ab5107799ab3c6efe83181b4e SHA512 ae98d1e68c8085e8b8eeec4e4a5c9efbe341b672551a961d96c9a7b11e729f5dbf747a08db14868ff1e57d497ae1b1d669b4a807bc89d4d81f0f0587f901ee97
 DIST gentoo-kernel-6.11.2-1.x86.gpkg.tar 76298240 BLAKE2B bf9065a12b771c0b6d7247b874c014c2043eb5959afe590f3cb84abb8b2491076f5f4c3f575f7fd30ff20e9ce5c474401b2b6eaef107f648621f03fb95cccecb SHA512 928f822fb1b656d479a56d083ec10b97032a75eb8b83745e6f5cb3a283f2b221ff134af584041ff9711e7ddff9d337da32d6178243e9635759bfc598e1d34f6d
+DIST gentoo-kernel-6.11.3-1.amd64.gpkg.tar 290590720 BLAKE2B 78743fef66f9868d5bb21e58450350102af9d0c074315b11b345d57d4eef80522e4a7392f0097bccd672fa60e0df6178c10ca581aafa8714a2fb4fb4ab039557 SHA512 4d1468f318576b0de633f1686068593e18c661938a3934fef4286a6854b0f3e32a29fa02437b07b4a6a21df461eb741ad236fa3346359d74ee4a392d502cc7f0
+DIST gentoo-kernel-6.11.3-1.arm64.gpkg.tar 266936320 BLAKE2B 0abd406d7ae2572ca05d7d5f2d1525c22d1a4f5562edaf4a04a41fc3c883d42abceb8d181f5a92551178f207c75a313d788995dcd29823a2aef0eaef757969bb SHA512 aaf4d09f3bb8db87775d46e377031b64fb9647c3b024f889e517a3d14e8b5068631409ba70b7410fe5a512c9b55e2c01e04c4099cc02efc1f8cbf4649a5e6a82
+DIST gentoo-kernel-6.11.3-1.ppc64le.gpkg.tar 72755200 BLAKE2B a3511528cdf72cb6f60113d7dbc0f0fcb4b25953a9200cd2c4c181d79dcbf98f622d1cedd9aa4356369e19f388faacbd8ae81e221c6a9978fbf4d5f54caf84d0 SHA512 eb52d04af845fd8f8eab10871dcfbc72b6409273027ed91cb2f820aa0c2bfed0aec6981dc36a3de1c074e7415c4df758f3016dadac2eca047c096d2640877acb
+DIST gentoo-kernel-6.11.3-1.x86.gpkg.tar 76308480 BLAKE2B 390e3ba29a1fc3c8117c6744f449f07a3bf99601f2743a5ed7ba3782b0dd1c8bc05df978d96581905e8216a8382c2bd37841108c1d5899846075ddcca8102e23 SHA512 5e6b88c6928f71f474ff47c238b39f7f09f9a9620d9ae33fad4c46bfd57ccf2c19aa47b5343894e15336d3424090aa60b672f8303dc3d9186d47e99446b954a4
 DIST gentoo-kernel-6.6.51-1.amd64.gpkg.tar 149657600 BLAKE2B fc159a5336426c45fef12d01a399d73c397b945bbe9e628c65378a5a62d82b9f27831f748a987c0f5c36d15d14250e7817dc3b30978a299d75fa29398398228b SHA512 becec3093881a45a8cdf6903c02c3c6acc453434990da02707832a09d4a13815fbfe348016fc280424245b7f04415edec7155a7bdad5a4e4af11d823f7efb16b
 DIST gentoo-kernel-6.6.51-1.arm64.gpkg.tar 119715840 BLAKE2B d7056f38de6c4601829768e01dafcfc16d46786f54a68d022280b993d6a307ed9620c9ff2ba5b98c1934b79bebf9208a79b7400be89ca21e8d41be0d5cb4ceef SHA512 2493c75d7958ea17fa8fbe7cef00699f83c46eb6aeb7795fadaca0ed5434306a19d4e4d6f74dae6c5c56db6890a9c85dc0b8fcbe1a67d1a95bed6800d00e2f4a
 DIST gentoo-kernel-6.6.51-1.ppc64le.gpkg.tar 64276480 BLAKE2B 728cde54c79ad1e59af44445f934eb0d032e832821780e047bf86d6d9677522e65f09fcfd90b7a662624a8ebb7f1f35df192a5b56a06aaadec2e0b07c11b7422 SHA512 bc0b82cfb31228d6c549a41dcce9a37ae28fa76aab086ae0c50678832b85510bf31d4fa2aabee6d681d40fa0d44ad5549ae1bdab34f6be3c5803b6e5cc712f62

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.3.ebuild
new file mode 100644
index 000000000000..80868c7e256a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.3.ebuild
@@ -0,0 +1,171 @@
+# 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
+	dev-util/pahole
+	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 HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	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)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		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)"
+		READELF="$(tc-getREADELF)"
+
+		# 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
+}