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

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

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

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 25ff072210a7..0edb722f78d7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.6-60.base.tar.xz 3204668 BLAKE2B 4076b1d74984ff1777a6d41d6c71a
 DIST genpatches-6.6-60.extras.tar.xz 4056 BLAKE2B 605705101398b9b0954b1b1050c7a35ca0cf9db76cb8b83a8686e4d895e96cdb5852b82fb47808a811eec73dbdb730550b4bdc09a9ce12c9a6f08f1c5fbcd2fa SHA512 6809450ccae6d26a77195a10997fc1c28408d8b1dd64cbe9985b1364d29ba520f4d1035e55fab34e6f169c92357a30fa95c2a9197da35366b09a5c634b9950a5
 DIST genpatches-6.6-61.base.tar.xz 3347520 BLAKE2B 1ae6cdda7741b2ebe6c835e98d9a8aed84488fa37159dcf4f232ac4da61dca065222cfabad1a82149dd67883e8f03bc5144730666ed488d7ea94d0d8ff8a6f93 SHA512 99ab0feb0cb071ab9febcd327f8249fc756ca3ce04b43b4bf4801dc8c3a758f7e33e49bc242577e25c4ee6db2107393c19f57e7d8918033f09cec34bb819c3f8
 DIST genpatches-6.6-61.extras.tar.xz 4056 BLAKE2B 9dc9a160fe6b5b73ad7f479a8edb246db66adcb7cafb1dfa770e0ed234d56eb16bc782b42b17e80bc8048ddda986a219dd3e018c97d887e5e249cfdf6c1137be SHA512 780145505ba77b93db165495fdb66ac02687ab0f15d9e0718970557e9b3b12e913abb33fd99db74c68157766f144811af6bde0b99baff62eaf4277144867d066
+DIST genpatches-6.6-62.base.tar.xz 3451484 BLAKE2B 526cd644a849da225bea9e77c91320c6fd28c26609e47123051eacc13827d9307b8bce1e53c0ec7ffbaaa9424c2da8d6573d40fc6ac18b4ab99f471b2ee7818b SHA512 68e0423803d0328bdde104b8eed06b144cd9aea0a6f8af8698c9d954fb3301a600de0bb9c48e084f957ca0efcbac5afb6520d234b8b2daba45cc203514931393
+DIST genpatches-6.6-62.extras.tar.xz 4060 BLAKE2B a475e52b151241692f6db4b41b19d6ee0212fafa1570ca47bd9c1b6e3a3b00a00f3a12a023f5c13f519dac46a01147d513ebfe37011fc289e9b3590fa2fe5a69 SHA512 dfcc7657e7299fca6d3da30fa2ecbdcc00cc1133607d3ded5d2f8f9dbfd5877906e357368665fe3757ae6b873ae4313c321ff79b8cda5ed213b7a1866dc9009a
 DIST gentoo-kernel-5.10.226-1.amd64.gpkg.tar 63303680 BLAKE2B d7fe1733fc5686e91cf3cd086e64ab3695f61f71d053901fe6b3bf8946cf67858b6fcec89ae4430b3d033c0a8c2069d3ad2c85e9f3dc12cf0fc3ed637fade62a SHA512 0b267771cda36cd5597d2e6dcada6b1a17dd0d89df8602bfa822fe94d7e844f0d81bbc1177b88a54879b273bdfbcc9b479c6210ed476f65b075c8e52bfd384f7
 DIST gentoo-kernel-5.10.226-1.arm64.gpkg.tar 56750080 BLAKE2B 7dd5adef82039d4aca30824168d5eb56d95dfc0672e7c401e6da9dfa3cb1bc4c4eb0e56a2a3a769cfe92e3c71d19e35af5c7017567cac6d5026b3b50e280b513 SHA512 fc19ce80ab64b670b48d67913ac81bc953e73d91f9e84f4421e6e7aea4302f6ba43db786b8f83626d89b47b881f2e88cc1794aafce5e75704f4d141a09f3b12c
 DIST gentoo-kernel-5.10.226-1.ppc64le.gpkg.tar 52766720 BLAKE2B 830c15ec760643c636c1294a8cea2ffbb0f46589196cd10a97c09e4d131a2e32398cf18f3f4d832e0ba1a123f031953ff3f931d86a60e6e6d80d8f7f5f0c446d SHA512 e1662eaf7551b54afe01a0b23f88447e3ee7684d17d6515fe4cd9e6dea28293d440b677a1e55b83583c74c5362d6e9bb5939314368c3e7f6bbf462b60e055dae
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.6.54-1.amd64.gpkg.tar 264038400 BLAKE2B 43c561c8320889bbd44
 DIST gentoo-kernel-6.6.54-1.arm64.gpkg.tar 240107520 BLAKE2B 82631d4d9537959bb75f99b3b065a423813f406f541c7a43a3204a83ab323d775ca7e45ff0db560166bb8f3aa185fcbea95c8cf6a7270760e5365e35acc01f05 SHA512 cdc71a6c5b32eb51bef79075784694170d4015a333f781beb66be56775c1b488e8ae7bec376941c36af14b8bd50f68f29ba5bcfebfbce8923d57cb96400faa73
 DIST gentoo-kernel-6.6.54-1.ppc64le.gpkg.tar 64286720 BLAKE2B 2ebf7d82817f46deacdac2e34fb6387e0c82723b468f0a6c1d5e759d40b9fd89c14641aef1ba6db711386cb355afc8f48918b44d7d32ade1686cbbdb83adfe6e SHA512 3210d827dbdddf6e61659f3cebfa778ecc9669f6c176ac7226625ea1231fd2f212a2420a0cd1d5f10f9ce2133d58f74a4542a61c41162d09cd10a9bb3f00d121
 DIST gentoo-kernel-6.6.54-1.x86.gpkg.tar 68331520 BLAKE2B f8b49c5579a237b8d61406207c2c46b5df6fe69da25b3f8a29b724a96b90e8f520038a411f6e989eee1c1143cc4a5fb7c7a8aa2fa03fcf4d46968f01cf093f1c SHA512 89b0bdf7b96f264783c828c7f3676e10365d40f6328cb2d0173ca430d6daf052c3b6e09b8df7447549bfd8be79d850e64cf782da08fe5f1beb33be67e72a35e0
+DIST gentoo-kernel-6.6.56-1.amd64.gpkg.tar 264222720 BLAKE2B 9744f94c6c7d3e450e346e64a665b42cbc1f3a49cb6ae4741f82aa7523f267c67afafc3e4544712fe221bd51b745ddb6f5fd83a0edc4b7916ae5b8ea70682751 SHA512 64491534f68e81a30d75d2434b964708175208dc5298d9847baace8a83f363a18b0efd604f0d1f0b57d4e5cdc283360b819c4a982ad3024cae42e04eb8bb2cfd
+DIST gentoo-kernel-6.6.56-1.arm64.gpkg.tar 240455680 BLAKE2B 3146686d24594a64dc98e38fe66f556fa420f7af03e3881b92bbbec76902fb7e5d5e1eb0b07758732d5894bb9b78d6d5773cd84af0efa284125edb14c5c6babe SHA512 c3f463b8a05bd79fbeaa8ed16b093198d51177ba669fd4b275160066ecd17e72867b3ed0453dcc0f569044cb53889c3a0cb4e18b4ff18839f12c49ea25493964
+DIST gentoo-kernel-6.6.56-1.ppc64le.gpkg.tar 64307200 BLAKE2B a5931dcaba361d9746e52c0678d9bcf4683790f8ae8774a077cc6e6581b675a54e3b81f51c9c4d90943c1be4981ff357cb2f2874ec0514572cd1fa0fd61726d3 SHA512 2caec2de3e2b7e2b4171f4573228a06f3e05f18bf72c576fd88718b2f5d1e124e746b32e05c80ac9e7cdb30bef0a4cf124badff06e32918b7168e302335c57df
+DIST gentoo-kernel-6.6.56-1.x86.gpkg.tar 68321280 BLAKE2B 83c9050276f6dcd7b5a43d48f2de4c5223f426fa4be513e6e108456c73c9cf380ada26a35ba00da03643b6afceb6ef595ab26e3063655c840046146b5edee35d SHA512 4503abad28c822948198231c406c82b53ff8df2924a4c05e4f1f742ef336b5c71d007b5e45872b8eddc2308a0fa6dcb8f3941499532bbe4df54e5c67b96e4047
 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.6.56.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.56.ebuild
new file mode 100644
index 000000000000..9f37dfa41127
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.56.ebuild
@@ -0,0 +1,170 @@
+# 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##*.} + 6 ))
+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 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
+}