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

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

commit:     048d12e90608d3c6220a6282f12d0ce4b35ead01
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 19:52:06 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  2 19:53:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048d12e9

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.15.158.ebuild              | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7007e7ca7297..811846237daf 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-166.base.tar.xz 6725224 BLAKE2B f19d204334748c6c5befdecb51c
 DIST genpatches-5.15-166.extras.tar.xz 3940 BLAKE2B 6db1809d2ff7d407c12a461c737a80ddfd0a91aa762ad2624613640202f9a65bc39b538007826740f42f8aa210b13f2936124737c5d5793a94a9778456135445 SHA512 45d025bbede7990ac1a8f285a6c27d4df79aab77842ec2f63b7e2e44b53b27f00da5e3866ced56fde852453130dc0930e8a1b2e95873af4c2d7a663649d1f800
 DIST genpatches-5.15-167.base.tar.xz 6743824 BLAKE2B 4982628750d9373adf5b97fbd9d1042772cfdb2724b101ea7dc36b39587e78ec40cb1fc0c2fffa7e8e5e9d6361f0efa1445288fcf50f4d393a794c3566cb4ea4 SHA512 3ca376b96d52855d1c4708011defa2822fb94048ee7354da68db03df4f92497580b141d1b74982c8d6cf8370fbccbaf0883d417c18c5c0d3762c8d6fbfe977cb
 DIST genpatches-5.15-167.extras.tar.xz 3936 BLAKE2B 48ef973309b1831ddb3775e95707a5550d18634cd3b567a5616e00f03613c9ec7ccb842fba4a4fe13b88190e7f7ad061ad524fcfadba4a196e8ebc0e5c40f245 SHA512 4ecf70a33fb2e3d825d952b7ac32ec1b0cb38f15f4f77d2bf955749bb97cb438db76974c40372ee894195e11954f9097ac6ecf17832f5188f47f69e6b917bfd5
+DIST genpatches-5.15-168.base.tar.xz 6757748 BLAKE2B 32b6ebb14ed20864b51fef7cf5e81bee96e4b634829d10b0f29172c41129caf856442cb7c116a4982c6ec92324661daca1a0644febac00d2d39ddd43fe1902b9 SHA512 62b37104e6ac0c9eb09de4fd1657e945be70e90d4682537e762f63ca8ef34da713619d518bf6a0fb35aac4b1541a44d91ee18d806211c7e4cc4124449de49bfc
+DIST genpatches-5.15-168.extras.tar.xz 3972 BLAKE2B 6cde986105f72e9282c78f59c8bb82bd3ac7c5c03adb3b3c1c657204624df2a28048ac0fe095759d5906bcd6677831d9962894b76390c2861482440120e72fe5 SHA512 6e067603b8e0e318703a59347d38d7aeb44a3097c39df07881c0f5250207b05442053a8ddf32069ead729ab4c36ccc1177ee8d82417ae2dbe16014b221d0d1ad
 DIST genpatches-6.1-96.base.tar.xz 5079348 BLAKE2B 97ea3473a5189a92ea4478ff82051fb6b9b48344284168902c98674f4d093e2d9e8deaafc5e6ffdfe4653c7aa41bacb5c094f867dba3e283bf2fbb236d753d80 SHA512 3e7f9a56a0767b7532c89460c156d663e2bed069223c27f7b6d5ca7084c3ee869b00bd63a844989c4801e29e442ddf7889c4a025af97195228e181564d8f087e
 DIST genpatches-6.1-96.extras.tar.xz 3812 BLAKE2B 506642a22002bf8bd3607d2bf060740e29d1a6bb649b0345f751c83e504f1084bf0bf279e69c7f52fae517acd7b166c32861f5263d843a02384d12b7f6e04e9c SHA512 1c5a7f9e3f28d2db1d0136a037d32c30cfe754186491970addb9f3b8d24bad851e9472c028e6eb8dcc71bf892a227d7a7e606fa7b7210cf11f79b6d8a063617a
 DIST genpatches-6.1-97.base.tar.xz 5144036 BLAKE2B fd20d0a6c4b3f2bb68a97bc71e4853d0a1d2d93433904480fd89787c11976be51dc3510fa130cbcabfc47fa68be9aa66a5ddaceeff522f4b96c95d35e5c31802 SHA512 db1cba6f4b2db0bd24430622ffd4eb883416f559e22f8f7116ce1d26a78dcb811c02efb896e0cf470c4a7839a3af7a564041f0b4ee56d1febbc52da62656895f
@@ -36,6 +38,10 @@ DIST gentoo-kernel-5.15.157-1.amd64.gpkg.tar 66375680 BLAKE2B e27d6f2dd3259c31d5
 DIST gentoo-kernel-5.15.157-1.arm64.gpkg.tar 59750400 BLAKE2B 5891ee1990ba5dd2f70eb2634595e6510d22e30dc7e21d66bf2c2f69c09573ba73aaee2893bf53af5a44fde99b6167d18a03725dc105dd5e4961f61bc4cb258e SHA512 42f2ab5d0909ad8ada4ddc9e4c00360e1d7e123da2b0d7c7652869a262b47312e23748540e9f05f96fb00a7bc083c933b7cc73cdb752b518e99c7731de82e3fc
 DIST gentoo-kernel-5.15.157-1.ppc64le.gpkg.tar 54978560 BLAKE2B 0734dabf3b1ad4aa07177ca3ebbd210d3a7ae891974b570a313b6532fc88cd02acf6d27f2cabd90000aaa0384d916324dbd52e5b622eeed4849b9293ef76e6da SHA512 0dad2046b49f24ffda15b4cff953065fc06209dfd1cc914c3ccc57282fed613d7fa3c5db4533c6b1dd156b981533b47048d715882af5e06a5bbe30713aba82f5
 DIST gentoo-kernel-5.15.157-1.x86.gpkg.tar 56166400 BLAKE2B c55ed8c02a2946490371d60e038d628926e40071e9cbbcfef73d287fdb8d44b348c03bc5c0a356ac09375a02b6d06a1e27ca024b5c3fcc956a8122008c3f8876 SHA512 bf40c482dd05ee75c0719fcdf556a18aa68ffbdb3539b8954fa562e79b731b283cba962500153758f78e9f1222a4aa8b46140b96553d1acd406fa80bab9e3531
+DIST gentoo-kernel-5.15.158-1.amd64.gpkg.tar 66334720 BLAKE2B 054aa0baf29da57881e4c00531a3ad1554d35c174b7e5be89269734045daf23dad8ed19782c7cb313e4f5a41481d1f78920b71266aedd9cd89fa25cf69d2133b SHA512 ef9b138c73071eccb483327b9677b0162c17d4d38e2056a0ef0a2f4780e9a4cf3969567dde9bc6b6a5176912f63b1bfa5f36311b5b9f068410eb538448e01b4b
+DIST gentoo-kernel-5.15.158-1.arm64.gpkg.tar 59740160 BLAKE2B b1da63e9085ed1b899f41d6a142f6882dcab9f66bec90a772eaa53ad72b4ffb3822356286a93d07ae522b56ded61f04344b511b3e2892a6475db5b4da7f818cb SHA512 d808b1a493935e537b72d7d0c7655fd50eb5488a3e1e73b5bda81031828b8c6c9155d20d66ca56f6b1dd2c595459149053f5ad06fcc050ce44037c13ac03a3ef
+DIST gentoo-kernel-5.15.158-1.ppc64le.gpkg.tar 54978560 BLAKE2B 63c1ce29e1c261032df9622bba0fc80ef1d9de09518be7f10f5b40ff264c0ee794893803dc49dd9f290f6831e66309d48c3f9de40b924dcfe924d27a12bdf774 SHA512 6fd9500b64670486c8cca45b63e5a0d74871d35f3bc3ff20c20db2e41c80da61fd0309e07728b624ef9cbe4a6adaa3b8eeb2a26f43564233bd97f41ce9eeba90
+DIST gentoo-kernel-5.15.158-1.x86.gpkg.tar 56156160 BLAKE2B 997fea1701a93f54cd4b57b2c0cacbf192832d0183a32069a9ad10fb2efd43bae9bfca5047d61367d88b6883111c60dced1f750f41d2a62a4335aa871f5aacff SHA512 735031748864bda5555a4d038135395d051af8e9bd2007d287560b5346d4d5721460a9511fb82c3ced87f3a450272a3fc53562b857b6102c7b6635c6bfd0f32f
 DIST gentoo-kernel-6.1.87-1.amd64.gpkg.tar 72632320 BLAKE2B 599a9e9f056e91992a8da7c1ee9f417c414c9ceb9287be3a74324ebd6e3b0033a4b4903e3cb67793071a93ca6a9f13b4df1ef95eabe5fa3f8037898acb9e4848 SHA512 5cabe303802826b534705afd6c2258bfe141166217f9a895df6704eff7f52e85aa0aa20d880e6a6707acb130b6a8c89fa3c584e03bf3ada7015a69f0e1ad75b7
 DIST gentoo-kernel-6.1.87-1.arm64.gpkg.tar 65617920 BLAKE2B 7b9956650c78986e5a542835a51cfa8794feb88dac8edbbe20299da079f6dd0a966ae78bc824f0d96813bdd449e0665c38d714b482fcfe56cd11a29f1d564a02 SHA512 5866054d693141fc1c95d9c9e4478b33b040631d365f6d76b0720b34ab8bb862700b6c67686aa95eeeb22382ed9d7e2afa08d3884b3e6d7927917b94d643066c
 DIST gentoo-kernel-6.1.87-1.ppc64le.gpkg.tar 59883520 BLAKE2B 1a95e7087902faaa19ae4f423461df9cbd9fad0a4944ebe5dd7009c1ab751e392b6c75d18a5c03677bd7bbc0b1cd0b8ce984f2fcf972de9784ea6c396baee255 SHA512 ef0529856ef34a19335e33840b79ebb7090468af3cbcddc3f4d633beed6c213f76a1d4bd1a7eca1783254493c70664a8ec64ec67aa8dd48ffcc63deaf71ee3f2

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.158.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.158.ebuild
new file mode 100644
index 000000000000..eff249432fc9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.158.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+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}
+
+LICENSE="GPL-2"
+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 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)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	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
+}