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

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

commit:     7eadcb68cedb0e5a3052a48137fa1831b199cc38
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 14:31:22 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 14:47:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eadcb68

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index fb9d44c925b0..fa9a411e9db1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-6.6-52.base.tar.xz 2852888 BLAKE2B 1f393bb3b90106ebab46858e2b7c2
 DIST genpatches-6.6-52.extras.tar.xz 4060 BLAKE2B ba934440bce51a7d2497cefd4f98bc48bb4e1005e038bfce6d8a13660ffb9f3e3d21fb260293b5717722811c600eede8e4a1c5f2261d42da7178005ea95ec9fb SHA512 74fb01d8e49647b1f1ce134958218ec47eaf7983c55c01724a266ab29813c5878bf98701ba4af80ed1a6349d6799e7c1ed64ebe7a47584d79b38f66f91a9ce97
 DIST genpatches-6.6-53.base.tar.xz 2894996 BLAKE2B 68c68a4f3ef4ad60204cd06f86a3cb54810427d93ffa55d7cf08265f759cc9d789ade864b19964cb5c5ed0cb48cd8fc309590741bf9a02f97e226a7bff8b80ff SHA512 c328a28a3954b993a82024cda27720ac6667ba48224bd40f08e3d9a197173bdfecaa686fdde2cd96353b7fd38137091eeb6d9889849971d21b21ae91eeb6069f
 DIST genpatches-6.6-53.extras.tar.xz 4056 BLAKE2B fcc3c11e40145badde05428b03da9323a440357525d6f0f08112dfa6c2c4f170ddbb121f6d38503923eac0c1841ce697d0cca0654784b39b048a40303e8a11ba SHA512 8fe3053597ff48c9f4669faabcb9165e1f64454c2f5993a80a04ad124eb113361369cd2607ee40bdbfc0dcced95ff57381beca9b0ff7982d14dccbf3048144a9
+DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
+DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
 DIST gentoo-kernel-5.10.222-1.amd64.gpkg.tar 63252480 BLAKE2B 0641338128a2f1fe65e42d8cad6c448a3bd195d40df440140f90412e306d30465e4895fa56ed101123b1b8690fbcd262549757adbadfe86812d66632c3e17cdc SHA512 467bf18300ad9db1aedcc39aee5168045c41e6dcf42b01df8b7ae46359ff0db0e52b8d2f9612351a268d335e1f8101884c98d798d94bd70b7cb21e9378a61be2
 DIST gentoo-kernel-5.10.222-1.arm64.gpkg.tar 56750080 BLAKE2B d7fbda9b506ea787765386d9cdca0652e400b2f2e08a07e1facd3dad2425fc0ed0a7437cae5abf482ea23cbd4cf83420e4c4f9922cd732b69a12f6bd595897b6 SHA512 b2587672993ba411f5dfc707edcb9ada9ed8390e9c01814dc763f09a5cca5bf74f1866e7e25bd836bb45d75056d2687daf6392db934be01272d1df279d3b271a
 DIST gentoo-kernel-5.10.222-1.ppc64le.gpkg.tar 52776960 BLAKE2B ec4567df5ba15b87b192ed66463888ecacb6f61246c6716e34c94a9a86ccff8bbff5ca829dbaa49cd679528cb93dea19c1848d1920e6a246ce641107e85506f5 SHA512 40ca778ab5e673eaad8ea6120324719727b87d8569fb8515c3cb73bc8ace0e888e8d66e22c91a81b966bbb8256c94d37c323152d0f4e6a906217d5375e347d5f
@@ -112,6 +114,10 @@ DIST gentoo-kernel-6.6.46-1.amd64.gpkg.tar 147691520 BLAKE2B 46d24d9f19cced233d0
 DIST gentoo-kernel-6.6.46-1.arm64.gpkg.tar 119633920 BLAKE2B 9d3b5f991c530de5a27d4dbc5d61017f9434701e09f144a94d32af5f18511ec175e664fc97383d07b7f5446211cdcd5be48c179b5995fdceacbfd90716020ad7 SHA512 b67ca338349ad8dbb6060ffc127a93959ef29790a2f7856facde4281993e798e9e7a56b47be68e9d83f30bf96066ebc4a1706836d8ee2a6524b940c2bf06a93b
 DIST gentoo-kernel-6.6.46-1.ppc64le.gpkg.tar 64256000 BLAKE2B 0f08e5479891549142f5dd2a958a15b50c06b8a30c6b65728c32c8c77d62dadac2b5d11f50a79de88a4664cd343a47b78ae4e954020d0d1f9d450d94294a67f1 SHA512 5abad2bab8be161e131c9306a0970066d931d774d80cce09cbcabbf4a50c3c1def7564d62871e5637a4f1c38b433e1c95da07302b41391e4782920480bbd65ac
 DIST gentoo-kernel-6.6.46-1.x86.gpkg.tar 68270080 BLAKE2B ce378eb77b0b75a4be8b87b3059ed89dbcfeb6b861cdfdf13d005ea846ab4da58150619d2a56917cd914231ef87bc95a37a90d992fc875f97dc3ed2cc8cdc4f4 SHA512 fd82d5e1aa02e50d47b8ab305dc9e95c702595debce581ac4a5f4f2fc178ab9048d0352e112b23ba81987174c04d3ac1686bb1c16567f4554ead278cda1e8cdd
+DIST gentoo-kernel-6.6.47-1.amd64.gpkg.tar 149637120 BLAKE2B fcee3f615fe143b8b12d741bf0df758f68c607b0315ec054c6c804d7999339fadb5d62c355ad6e110b5633e8622a4b8f075bd3aa93d40f22fcf00b6b4b2ae7b9 SHA512 18ae1954bc9c10404a201fd9d511521f6f9ba9781f994e8d0ee082c4edc2908125c4db59a38fb672e492bbc8363d4c90f7d3ee216cd5e8dc5e7b0aed8362555c
+DIST gentoo-kernel-6.6.47-1.arm64.gpkg.tar 119695360 BLAKE2B 9bc6ae80d5e41bf39577a6c27cbf47f550c33951f19fc4f9c46dbf15a181593f20b15679f7ae33623a15cc555602ee8828ecee14900f2af14711bf8fd33fc5eb SHA512 4079e67ae3e639b3559026c66e87f2fbe4f0884f02d0f0b73f97f16fc2547d4f599ea49a0868cb06a5d4254e378962fd21f581c430c5a5e0c4cfd782504599d2
+DIST gentoo-kernel-6.6.47-1.ppc64le.gpkg.tar 64256000 BLAKE2B cfa82483ac8a788be9b84ea9246224bce5ec2fe71711e063d6fec46286ef72d488655323cf01beea628d73f8f8e57d42452869ede0a50c57caad474f9eed500c SHA512 2aa632e90471d8c41e275c95cd636725384958b251a4db30ee75fe2f13de4af7ac70a42fb44ef83278d7df4bf5fe5bc1e1f9f080ee71f66c6baed0a290714246
+DIST gentoo-kernel-6.6.47-1.x86.gpkg.tar 68280320 BLAKE2B 57b212caf88b8b7a71fd4ede1528fd199c65818040e714c7beb23995961cb05a12bf8fd99c8c9424c600a86e4d55217485669afcec312588be516b281364db38 SHA512 19039f740c65474332906f66da789f6abca1e80d5c6bf2292705e8830d0b062c35e79c5cb4ee3c3c8ba92b794aa316bbbfa7e890d81ca2da6536d7fbab8c6c1d
 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.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.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##*.} + 7 ))
+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
+}