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

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

commit:     f2f836a2a8a5fa4c123d4efa25b686c2443f25d3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 18:07:30 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 20:33:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f836a2

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3c09965d43a7..2503035810b6 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a
 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 genpatches-6.6-56.base.tar.xz 3040548 BLAKE2B 751529aa9bdd2aa696fb367cc2afdd4def0783640c847d65d836dadc74531e5fbd5595ec4aa1f89fa62004d9437dab57adc92b64444b5ed3299a3ae6884b86c3 SHA512 a9e08b3eb6fc9c2b595a8ab6a6933349172655da0126cac6498d0c541bd2d6e1377b849041f03af519927219c17b618ac622f45ca931bd0770bee63c64023a26
+DIST genpatches-6.6-56.extras.tar.xz 4056 BLAKE2B d54da14f3afefdb9aa8c6597913f37c5d1314e4a93216608bee52a52bcc05924bfadf2d5e7e49b0488159b0a57942f1579a4e7b3fcdc90a78c10e0efffb6a1ed SHA512 ba961d5434222ecd618cb44b08ec6413d98c1d1958af2712065d924370141f789ebb315dc53a5bdbb75d3cbe86cf719983e66a58d537eb78455eda509689aa73
 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
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.6.48-1.amd64.gpkg.tar 149667840 BLAKE2B 4259126edf7b0f063a2
 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 gentoo-kernel-6.6.49-1.amd64.gpkg.tar 149616640 BLAKE2B 5c0c0f07c2313e6a79f2811bb00449c8229a9daaac86af0a912bb140bde7101390bcd5750411cd6ce5d47b0ed74431dafad92e310a0a22043aeb0a2ae0a4e23b SHA512 87b9244364c4c28fedd8b46161227eed11010c37ec187b175b197555c46d2fc44be698a6ad8579d55f8e375dbed81136fcba3a2638287bd21017305594d9f7c1
+DIST gentoo-kernel-6.6.49-1.arm64.gpkg.tar 119715840 BLAKE2B 014d1b3c8a215a9652050f20f2a05e985fe19c33f15e4b35040f5ef47debfac7e6e4fbebd05216fc17a3d112d5633640753dc604a085be76b145a155ff1e4acc SHA512 2c8f7867660b2811d7003c5ad6c455d5d9c615d0b454ffe34f8a80c2bb16a7ba860243ee3f1e94db8bc64c6e6cdd66f48f86501ba4568eb00ac04f4ca3c05194
+DIST gentoo-kernel-6.6.49-1.ppc64le.gpkg.tar 64266240 BLAKE2B 983293208dfe100e2033d84800127fd385ed3c5e904bc461ed9479470e4c98944d2fd855afb96cac227962539fd1668aae3cd6e59fabb3369f6071971377ad34 SHA512 f6d3e5afe6e878881b93396a2a03058d87e5b74042e10878650e214187715b682bd9820e088e6cf9f30c94dd3c1d2968bbe93d27e84783c5c1e8a5e04277579e
+DIST gentoo-kernel-6.6.49-1.x86.gpkg.tar 68290560 BLAKE2B 06926f32c8e169409726a998dd196ba98024593a96b842e1669ef62133f3dde4a36681d6a0b3f2e80b065bcb7fe3be8365833aadbd7bb1158f116c382126dd49 SHA512 7061875e2342f7ded436d628e4246063f6f166dc78777ca9111dbee85c37b3122904039a065ad0386e2b5960a339c8f6e3a9cba52d6aebf0989d3c1e45ec0593
 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.49.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.49.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.49.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
+}