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

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

commit:     c229f9dcc3c79609973d9504a2d3878ebd0db611
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 20:56:57 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 20:59:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c229f9dc

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.11.10.ebuild               | 182 +++++++++++++++++++++
 2 files changed, 188 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index aacea4dc33b5..ef490abe9407 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.11-10.base.tar.xz 757872 BLAKE2B 72566af9a781288f516dcd3088185
 DIST genpatches-6.11-10.extras.tar.xz 4060 BLAKE2B a94b8799f6c1d338a17e25b1dde6aa616754bfde092eb5ad1da11a6ec8b1107dce827d05ecc756a4918339329190e6572bb089de89d9a11c8c08f067eb7b269d SHA512 1a166a0054827ac9bef700d075cc2a1e3934dbe7b7aa64b34109b521f5bb21e231d59be4643f6faf702e5d0b3cb7d82e8cc1ba1f77e3bf88c38f9b6ffc61e35f
 DIST genpatches-6.11-11.base.tar.xz 775800 BLAKE2B 96407b5f017dc4f59e07dc51d26222ecfa70c4575fd511d273bf603f69aeb826d811d73e51b9425fc3986a369a1a1ea2dcad49d0064d27c586262f5ec2c1b2f0 SHA512 0148bf938c34d063ba68c3de1535c2e7ae7d1c66e75ce3d9106ade4696ef391511dc3342b5919f3eb84976ba334123ef1ab1ae3c63a2a63186e02f08c9cb096c
 DIST genpatches-6.11-11.extras.tar.xz 4060 BLAKE2B fda21856e2eb78f116cb26c24bce03c7fe60d0756610351351047f9fffa97ab327851adb1a5aa9ad7c9c63838a64a5498c5343b7499e452f0e3dac6cd17c7e45 SHA512 63d82a5a17472ac3e5f4c0bdb1cb706c0a1dd4e0d0bc2af2868a55e8fcc0138bdaef675b195988c00665a4d61f3c0940f669caa8809fbec17e0127962975c0e6
+DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B 16a87065f9bef4016c3a19cc4e4ebce8b1dca6b6a165a36f73b5e10737a6df325f2649c609e7cf6489f683c36e52626d21300acad383df486cb866a413416ff7 SHA512 fa57d9fdaedcc5ad31d685fe512cca89f1a8a8fb097001ee069efbcdb9c377000f154c3133757e19cb7d3fe79ae54d996d1720e9eb70ba117f98c935509b3617
+DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B 69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4 SHA512 33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
 DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B 80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae SHA512 02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3
 DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B 073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd SHA512 0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8
 DIST genpatches-6.11-8.base.tar.xz 639004 BLAKE2B 218ff37e8fb82b4bff3baa5b197b4c42ec19a4c5480620982f7befe8313f0f226324a629d6c15eee230faa3fc7c5bb558a58ac94e2e9b0259823c813220681b1 SHA512 cccc58e7ed24b90db88b14f9a693ccd021b1fa1beb9568511e344807673d2e518a66b2ffb48773a5d68da03ad15671181b7dc53bf2161ad1a88e95b555389116
@@ -104,6 +106,10 @@ DIST gentoo-kernel-6.1.119-1.amd64.gpkg.tar 72622080 BLAKE2B 6dae2c2c855fa0e722a
 DIST gentoo-kernel-6.1.119-1.arm64.gpkg.tar 65587200 BLAKE2B fe181ce54ac34921589ed7dd9233aa584a9fba83cd4e45a3b3a7c96d4220dad8f8f7b3a3a2e25476a2174639e50343f772c939da088cda35536d5147462ee949 SHA512 32b797343567eafe995f5e651cbd6bb6dbc09a6c88ebdfa8102329bd0d00483caf45323e8c70ce641db983e8337be1902b8164cc4f033a44f54d335bb1d07f0e
 DIST gentoo-kernel-6.1.119-1.ppc64le.gpkg.tar 59863040 BLAKE2B 2cf1dfd20305f44f10d3dfbadaef102e53678879b38d0bcc85d30b60865891984541cd6aa4e52285bab71547a26b98527274f4c5a5dd92f1594ec73344e95d4a SHA512 0d71f8bbfe4dab013ee712ad2c233c1e8d9ddcc581e661a3af060010b7808e15f159238e6c6954b29ca6409019e5499e01c9c71ebfeb75365f8875c1c6cfec77
 DIST gentoo-kernel-6.1.119-1.x86.gpkg.tar 62177280 BLAKE2B 49e2036da2a9ae2b285a4b56489021ee771a3e5541f8035ee891f02fad45ca0976a05309a7efc1379ed85290bb6a78c82a6db65ff67bdf4d66035669a021c023 SHA512 8956400e89077cbff52dbbbfba0428857d3bf77a8a7c64c725a5e841bda75d8086891d7dca4e5c6ae5b69774b6a02339dd9836c259c7929ab1fc1529d9e4e04f
+DIST gentoo-kernel-6.11.10-1.amd64.gpkg.tar 293836800 BLAKE2B ef9074050bfad68bef3b2f28681211e03435bad2b715915726c8194b3606df6470b5ea374b3d9f805727f7d37f943928312cac0938e15cb565a41e7fa9e07362 SHA512 32a132baa3b77e35707f75a00ec49fdde32e67276cc88d0250d238447513c0c58ed6854d32a74ed9ced9f5055ae98d63abda2f7878392d8155fcb4bf876128ce
+DIST gentoo-kernel-6.11.10-1.arm64.gpkg.tar 268933120 BLAKE2B a8ddcfc11544bce82d51efcf4bc5a4ac2fc3bf7b7d6ac7f7c628ec554c440551754f3ba554f306c1ab2532b44032c5581ad7e6e5cdf8ba9aa74e43ab3eb65706 SHA512 d9c28da3e7c7b31173feb02264d85e9638888a2c43ae0e9f98ca4f3283fa2fd3fadbf16eea1b71ca46957f48c7ea3bdfde7ee0cecc52ace91d9d89ef6b4ebbdd
+DIST gentoo-kernel-6.11.10-1.ppc64le.gpkg.tar 72847360 BLAKE2B 18a9bb4314fe95fe52a606f19e95a9ea921d440da6cee009232ae57f7a72f8b9f6d529df50cfff476fa9c94251ce69061d699ec18d5355d28f54ba4a7ab24e9d SHA512 e149abb89d4abd00d7aa9caed0731fd4131e334f4f678ce9aae494358165e0423776c1c292c9549c5d45dadabce01a2ee275f3285d6152a413a26659adaf4d3a
+DIST gentoo-kernel-6.11.10-1.x86.gpkg.tar 76503040 BLAKE2B 873d1e90fd7df593f9fbcb76114c02e4784847ab46cfa132aea95528d31d9f94d997256db1362c9e11925a7586217e600cfc109ed6093e9c9aa3ec04a601e4f7 SHA512 4945da30169963636eae7df359a59e64e19acbfb98dcc5c3c803f7c440a8e83c4207f7d8663b6b4fa23763a6e051278ad68ddd337aa9c2866cdb36ad528b942a
 DIST gentoo-kernel-6.11.5-r1-1.amd64.gpkg.tar 291328000 BLAKE2B 9c1ba7d9cf2b34577a5fb2235619d0ee4cc35bc47923dcb6593c080caaea5ce3d0e1e9d31454ee7eee3417d30fd9a6e288667434b5b799180d9439b93a2194ec SHA512 73355314712a784bf44f5b1486eb929cca45c1643c1c57f8d81a853218fae27752106382e364a5ee2be7ab05dc6745ce81b118bd730a5f24538786a90f1fdf80
 DIST gentoo-kernel-6.11.5-r1-1.arm64.gpkg.tar 268390400 BLAKE2B 946224df401b5c18884f5bf10379862d2536c672fc7962f0f83eeb1966d897479383ee33a42ef692ef4ad4bef9a750740bebef36ccede5c4a3673635a4aafe0a SHA512 dc7d31cf8387ffacb370ce6db1bf830549c59e7cac744958b353062cc9a143370b80232070a9a32d324f9698f166f81da83fc1d93ac6e8dff103c61a318319f3
 DIST gentoo-kernel-6.11.5-r1-1.ppc64le.gpkg.tar 72785920 BLAKE2B 9865a9fab8030c696d8f84dcc471a9bd8432e6cd603b23e6c5e0fd181ae06b8f76255603d02cbe2767fe2449677be80ec4f0488987f56675df4e3dee41ba4a7c SHA512 a3971900701d743619127eaf8b9072e0c6f0b188e744de4433f3edb59f80adec69316682e3e2d2d787c26f891664bd33373d837eb7e205a0219d5602588181ff

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.10.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.10.ebuild
@@ -0,0 +1,182 @@
+# 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##*.} + 2 ))
+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"
+IUSE="debug"
+
+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 rel_kernel_dir=/usr/src/linux-${KPV}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	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}${rel_kernel_dir}"/ || 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
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}