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

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

commit:     5e68a28cee411937509b80f46d454d1cd13d2019
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 15:37:00 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 15:45:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e68a28c

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8fd67710b66e..8793d4ed1953 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-94.base.tar.xz 5046684 BLAKE2B f9024ee9302b618af0e68c4b0ed91
 DIST genpatches-6.1-94.extras.tar.xz 3816 BLAKE2B 1f542b22b91ed285938cfbc6eef5f6ebce579882f65cfd7031b38aedbc3fdbe88abefec221e3139f3ea44c9a7841283d733f4a21ac3c4e449273e4269a491692 SHA512 035461792175f6914813dd900c1ab18a93998d7a54f42cd15275e23fb1e0c6b76382e3dd9782f50aaea9eceb1271518918bac964f95db2d746f3deb0a9a0dc1d
 DIST genpatches-6.1-95.base.tar.xz 5062256 BLAKE2B e08c254f1e2e2a062d2b8026109d72553ca8083b170f0a4424c78ac53802bd5bf54d23195dd89f748ef6c253bdf1058cdd65a6f548d0b0a5378b8636b63c3908 SHA512 0607276c857bd40a96e74fafea00d11c0ac80a3801a3cb320230463be1f6ad52727f0081261194a6fff1b0d644b3561663eb51cb3c36778c5827b5859e0923d6
 DIST genpatches-6.1-95.extras.tar.xz 3816 BLAKE2B b1fd3b8c0cfdf227a96084fb8eb2ac99d9ff5d45bc3b3092818accd4253e677cb4962e7a554d3510a3bdc62dcad9b7ae22f549f15e0478241fa2c6d19a45da97 SHA512 73f46044c7d64969a287cbb269c9039bb1eb1d537fb1cdcfe0bc3772b9fa220419abda8ef5395d3d0d06ca80d3761a6eda610251cc825b79fc7fa3b4b0c1cd99
+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.6-27.base.tar.xz 1392292 BLAKE2B 46e3c354f7c27182c2f97bd20c165fa8bb79317bb136afbbe1e0906cd405e7cbcab1293e724cda38491f0d1cd9e9009146f18ad9b5ecf54526e69aae43fbc9e8 SHA512 363d26f9410e2d526f07c0831d36733999ec284ee01d684ad15aa5856b007a2d2a189ca414358da87a479dcbbea7ae24add9d8019b4c41c8bf1aae7b67a3b490
 DIST genpatches-6.6-27.extras.tar.xz 3700 BLAKE2B 36a21c970dd2c8f72a4496b9f72faea3e94fba49342e00b7cdfc0ca6d4f3ab14fef161a7d02ad13b1c7db73af3c96b1c145453d0645791b46b34f599b3947582 SHA512 996a1b0a5c625043ececbeacc648f4dd71da2e239482ca515b680b146ba6041feeb0924929b1b2b6ee4f3ecc24c85926e54e28058d9401d4399282151332dfce
 DIST genpatches-6.6-32.base.tar.xz 1799112 BLAKE2B a9c9af39b7da19c0d3f3a1893de26641b1d5d7ad242de4ceb1659d33573e8df8d173d363f005843149ee21598a2d4f8a6e5fbbdd02926c23cccc01a5c0b8abcc SHA512 2204a3ff6187c349a41f101bddffd39145aa530e6a37792b391db0b3c4150e290ce8909430e87c8deb18400d753a621b90c26d581c08abf104a8bc48197a1fe6
@@ -70,6 +72,10 @@ DIST gentoo-kernel-6.1.86-1.amd64.gpkg.tar 72632320 BLAKE2B 70f448e5c4123ab70455
 DIST gentoo-kernel-6.1.86-1.arm64.gpkg.tar 65628160 BLAKE2B 3e9d0b5bc00bae129f0b1dd159cc446dfdef4008aea5a0dcd4f4fcd36f6d84013c58ffa0f10cc543d1c3f49b71f99485ee32a65f9d55079717f361d123d00da5 SHA512 94f133143d7c6d366efe8826591ad4a126ac90f3fda956edf87bf546d3df91835ed5e55dec55410fb34270cbeca1458977005fd63724b618142b909944e97df2
 DIST gentoo-kernel-6.1.86-1.ppc64le.gpkg.tar 59883520 BLAKE2B a20443cf42b2d13f4f196d3f270103a52aa6e9176b6bd1df911e5ff25481dd47ae72db7b7847c81196efdb8dfa9f49d6a44d2f8ede816c2c5a57a8de7c22d863 SHA512 a0be130d033423580fd74ac578fa899ce379c4f75b40220d304756894a271c015428ca1ec97093f3488342da12fda1e74ce717bc1cc30f76d36cca83ffa50269
 DIST gentoo-kernel-6.1.86-1.x86.gpkg.tar 62197760 BLAKE2B 156a283cbdf1c2831b799b96167f3103532bf0a91b0d070dceff88e1f5ce637ae1b19db3241c188b20bd290bfb4aca5b28c327e14e5feb7eac103659419ea6fe SHA512 900e4e5d4d02252d53df40b0c52d2ea547b88a2e9fa63b197c824bce34bb14946d939de197e64a1ac7b50c1de210413dfa6423dc68e5d48334083547623d1e3b
+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
+DIST gentoo-kernel-6.1.87-1.x86.gpkg.tar 62187520 BLAKE2B 357ce3627b0d02e4e021ea425da0a68648e01da002b9c793a9ffffda1791a47444c6f5b72c3f8a648a8cfd33bd0b0e7399fa29d3202ae7fb17d89d89defeb00f SHA512 eae3d1e5fcfe477ba9388f317eda8b1f82ced34ef2c32f91ea0e469752d932bb68a67de677b4be75139afd58f3a363f5faebe9f352ac92646060e3dc713cb695
 DIST gentoo-kernel-6.6.21-1.amd64.gpkg.tar 146585600 BLAKE2B 12d66fe9f0f1cfc00af099447ee1f92e381a69b60a06e0cc8cd56ec54e5b7c6e3026dfec7f4afd4e329cc7ccfafe1694fe19208228634373333a0291f884e6dc SHA512 8dd171dc40cd6f102c7dfda63cd40f39e3071955641830c5c919de8e4b9f66dec42e0c7b90e0786340c3ab0d1c29a66ec621797e21c0ab4c19b2cf77944ba115
 DIST gentoo-kernel-6.6.21-1.arm64.gpkg.tar 119234560 BLAKE2B 516a6f7c564734b777d0ff3df63b414ff2a1cc1020fa1f5d1c52f7bde26810745a770718c5ecc12ca42c536a7c3efb430fefc5e8b7b091ecdda4edaa866c5a08 SHA512 143880a199dc92a8b1268a15346e3512933d8e8203dd1a981ecae063464a3723557324a2be7310073c3a08cd95fe79d80d28a1898b649481bb836384a8562426
 DIST gentoo-kernel-6.6.21-1.ppc64le.gpkg.tar 64399360 BLAKE2B 54573396023eba5487e8d59e18358ad46ac7ae85d5b7482d48961d6da5d54d4c5d6f3ac9e2d685f956dfd90c68cb2a6319bd93492399635a9f197b02cf2cea7e SHA512 d8e4ec6a1944f9bc9dc4c666af6029fd68be78da8717b37d56390721355ad9c4cf2e1b718e17838fb41f1202d46f6f16147c802fcb06aad3b6037e9bdb623690

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.87.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.87.ebuild
new file mode 100644
index 000000000000..2e2f305f3106
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.87.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##*.} + 9 ))
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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
+}