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

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

commit:     ec6e97b67e1efe2ce3ea123fdadc818db40cab37
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 19:35:13 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 19:37:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec6e97b6

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e0c69511f827..f06cce689c75 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56
 DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B 2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952 SHA512 358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
 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 genpatches-6.6-55.base.tar.xz 3018672 BLAKE2B f5f3e39c634e196827da06935b783cb87c3503998df6b1f3d711484ab984b4a378feee96a45b932b409593290ea7a77271eb39a1e5085e5a4fde3c3307ced95d SHA512 88b2ef56dc0c2e1e7c34a9a81b8981d4c8ab6ba5e5821cbf3da8e608287375f2f0eaff427fae8f47a59cb9fe2c3b8a9d9c569108f27b833a10c6b460dde0bcd7
+DIST genpatches-6.6-55.extras.tar.xz 4056 BLAKE2B d54e353fcd41ede054bfde20ef5bc6518056b1069e440e8ef31b4021ba2b85eb4b578e8aa73a0d778e21a692914ec850f2604e635ff178690a3baee4dcf106be SHA512 a59ff175eb6e7491fe635f65dc44878b8fbf5eacf805b7158b3e9b6c4313881d24a13fd6d252f23c7fd9b5eac1a2c110431ca02aa2583fff71cd306d1b4f3cd9
 DIST gentoo-kernel-5.10.224-1.amd64.gpkg.tar 63283200 BLAKE2B 14061a7a4219278bce3237f8d59015448fea6e195a02d8f5a1d63f41b0ed0d189febd0964a082eca1948f57cef5a4e96c569d26f0c1b70855cf447073f1bfbfa SHA512 e4e7f4bbf6750ec216ca46408919b5a37aac372a14a7d73eee1b44df2ed2a0607c510db1109db117c25bb94dd331fffbdfe380941661bec94f3cfacdf858e929
 DIST gentoo-kernel-5.10.224-1.arm64.gpkg.tar 56750080 BLAKE2B 2b31d7121e82bd500260b26fc795d0d59ecd1328fb1ae0b202ed24a5d1a41947b4b4a84db0172dcc76f6ffda4c5e3a63527e5d2156148ac673305bd57bbc1c4c SHA512 1e0a6ca9cf082b3aa9f386ff234f96d3711ae2cab36791be38077b9d5c80ed5448d092bea453f249cbc3cb486206a614e33f26de3181666b18aac47364fb604a
 DIST gentoo-kernel-5.10.224-1.ppc64le.gpkg.tar 52766720 BLAKE2B 789dc4f675dd22f391262f4abe1b89d60fe03b9b48a93643b1151f00765c23c470188e727cc437434a950b37cea22c237f9afc82304dcc57f649bc91ed0bc108 SHA512 18034bee9a75ce37a6337ccc7952c1eed4e0a600414a99e9c7465a1cb0619500238fa241e02e0cb0a37feeab9634ba4dd6d9c87c46fde93765e3b4983d455500
@@ -34,6 +36,10 @@ DIST gentoo-kernel-6.6.47-1.amd64.gpkg.tar 149637120 BLAKE2B fcee3f615fe143b8b12
 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 gentoo-kernel-6.6.48-1.amd64.gpkg.tar 149667840 BLAKE2B 4259126edf7b0f063a29190d8428bc2db34ba0dc82cc17c87d5e6ea11f8348f35d62caece7547393ff8fc3bdef7020036972ff23133a776618ff01a53f6fa837 SHA512 2a7cfea3dfaf9fa5501cfd9e15f0392d2267cfb057bac6eeffac15a87eb15be4a3be3745e42ef8a0b36c25ce00998648192457a1f5475c9facb4bdef71497438
+DIST gentoo-kernel-6.6.48-1.arm64.gpkg.tar 119695360 BLAKE2B 05a1fbaccd78edd0c8aab3e2c6c575a9194950da62da43f76ac4c504df6f0543fe15c7f1f9bc7b20a7a0975a5f1c5250f9ea0ab9bc69af5a86d99bdd1c4ba4fb SHA512 f2be7141803122a984327069cbf64753456b4cb83982517c0787b2e80cf38fe38bc3da788eb2aa5d3f0ca4e42ca96cdf8d4e9c33423a5f33fda78c2e5cc54466
+DIST gentoo-kernel-6.6.48-1.ppc64le.gpkg.tar 64276480 BLAKE2B 0d8f1b8e1ddb4630180d7301c0d4471b0cf2f0ee06d6a47460459d7d331341699ae901d7623d2cbb1ed964a072c9ec7e559a0a63f37002b5fe4e09304c4e5700 SHA512 7eeba47f10973c8e0f378fd5d7d327d31c251a4c7a92efc0d1c62ec0eb737f394a897e4f88670ba4f2ad13991662d60606f2eff928a0f044416fe95e511f7ed9
+DIST gentoo-kernel-6.6.48-1.x86.gpkg.tar 68280320 BLAKE2B f81b14c6a875cd9b3ee318c6133e00f62c6ac6264c4b26315980a212ab4f0907b3211bf7b9e4e0c278df773fd4a71041a75fa2b454ec31ed2800f65b737c7a92 SHA512 d4e3662cea245ecccfe191708daf42304ad98c8bd2f1c3d0d5485f85aec35ce492245a4d668f103bdcb80c04e85964d0e100d600b60029981daa9d4327d78c88
 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.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.48.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.48.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
+}