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

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

commit:     6c4362775b8eda455c06dee421e3e4a57693bed7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 17:31:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 17:34:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c436277

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b850f5e569a4..8f22348dabe3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-6.1-101.base.tar.xz 5248940 BLAKE2B af64a685e905a51004350b263e6d
 DIST genpatches-6.1-101.extras.tar.xz 4048 BLAKE2B 8664a60521d881f8e80103f2509831e35763c891cd589c907979d49d7af96d699fec7f9e8c3b8bb90bcb442ed2016890769f53d4ff205d76d25521094b24091f SHA512 79276866b12b61d11109c27ea31eca847374a3938c20e4a07ca2a6f63bc62ae0c89a9a96e65227ab123fdc85c171cfa100261444fb9058a30d70b6ce4c175dba
 DIST genpatches-6.1-102.base.tar.xz 5362424 BLAKE2B 74e978125492fec046201698208fa1e7b28af5fbdd89f2a1225de522313d92b7ae196771f922164e832b73e8c6f0fca498de10147f705a2a484a3a324ad8a198 SHA512 0e5725a4f5bf7aaf5dd24b185ce3037566032f6726cf3b288b490475bc95ff67c9d5d45b5f3ec4fbeebe6d827ff569eeb9ac5f819c8646fa838cb842f5b36091
 DIST genpatches-6.1-102.extras.tar.xz 4052 BLAKE2B 9820e9c0f2e7bf2c64f3195c3491596430ba901951aa3e9174e799100310d038a20f8f82f0ece1fa397daa45fb3adaafc84c31d22367065e05fa7b2c0ce26f87 SHA512 2fadc41f696940abc7f7c02851542c42feff71e81910d779bc795ab2969a0885536054396766de2d071d289a372c79608c75286ea2009a774976da826b885901
+DIST genpatches-6.1-103.base.tar.xz 5388276 BLAKE2B 65937527b152c928f416a22f8dd17db2da99a90a0c0e9629f91123eb74b20b9f3679d9a937677e212bcda44ec96a500c1385a91e2de407183e1cb95be7b2e72d SHA512 1fd3c15b85d4da0bbae51038787210345c72364a216f5b7c1aa9e162535c529866fbcb2487ea9eb84de26204de1ea48613107fe83483c47e6b27f36b6bda020c
+DIST genpatches-6.1-103.extras.tar.xz 4044 BLAKE2B 72b5b73ab28b4b138cbc00cd04a2ea28763b1e95b8fda754c15fb8de5c23f091d536152f71811f165117bb670962b94ee22ef236282cb3f8a47157ee316366c5 SHA512 6cac58d98e3e6590b708b1a506e9e6a7b3bce9a83dd0915f95468e657e066f68d778c8953a574a3e8e9b175f6605b7f982e0235af99437059d282fb26d79a1f9
 DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1cd1ecfac87ddaaee1ed3213f36bedbe4441ecfb062abebd1312572971e9cc9e5a0e8d3e16c7af98862b087906d61fb4e1e10 SHA512 6db496702e671459f3b054ce7068bfa48fc3b2be6bd3cbc3b158f7d4e0a2fa2310b875e46d233adea870775358e6e9b4f19fe8940d146575df9a41bfafeb1ded
 DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91
 DIST genpatches-6.6-40.base.tar.xz 2364536 BLAKE2B 53bf04c020921c8d0c2e7ff8466db4cf5078ac8985e95b5b94c5fe9e824747d66344acd5d8675c42364704dc34268cd636fe10bcb02b657cac889ea8d0b4ae48 SHA512 c5852fc2db474fcf697818cec947cfcce0dcff834c57c042c42321889839d94c26d1994dfc275e64e0acba3055c90f0f0cc4e2a07c80a71a71f3ba99f6093401
@@ -40,6 +42,10 @@ DIST gentoo-kernel-6.1.93-1.amd64.gpkg.tar 72570880 BLAKE2B d58b164a87648f287c87
 DIST gentoo-kernel-6.1.93-1.arm64.gpkg.tar 65536000 BLAKE2B 3d1e96669ebaa6c031801f2f4c0aeac9eb04d970c39ab2618ea96d80d1e3b801c751c826b2a986b6a0bf527d5ac3fb18f21d96abeb470d1b1b4e0a50afd1e88c SHA512 b018b62e4c2a0ccd6a60ca931e2e4d4c6d88be95b7a574e89397cb64926b249d45fd74f889ca0cc75cb94946d3e81231d0bd2205281408b6127fe5d2812821af
 DIST gentoo-kernel-6.1.93-1.ppc64le.gpkg.tar 59791360 BLAKE2B c2e0634f0bc807d1c3e487e249b9a07e134bef9340732514244f02ee990a6e9e22c6218fe98ddd4cc1c352fc25ee74e04596633e9bb4d9f02d442138bad55aa9 SHA512 bc0422be6bd7c4f2194aaa51867c65a4f14a13464d0b4c9792f841d886bc8d208b5ab97762f5ffe9e596b77dd96784420d512706baf4aedfacc6797ab5385950
 DIST gentoo-kernel-6.1.93-1.x86.gpkg.tar 62136320 BLAKE2B daf3ebd9049489954b377c1466b136ab50ae0ff9f4a72701a01cdc52e89d27f5027df675b6331a4feab1b24ba0b29ca4f1ff51efd3bb03214bd8816ace1219e5 SHA512 2979e2f301a7097e7e7fe3385f28d2b98cb91e03ebbbde2b0cf0f989222ac5f655f5316002a94657b68682bdb1467c9745d501121e7e5d408cbbc375b4b31b5a
+DIST gentoo-kernel-6.1.94-1.amd64.gpkg.tar 72581120 BLAKE2B 68018b031dcbeb44b6d93faf3694cae93e7efec537007a0b6529a38006ca97628a66e6312137fe8cdedd7f2cec2289e046484f92ea4d387399c5dfc3b8e8fdb5 SHA512 a749363383ecae357d803a167a32ac86a37e07f1393f4afeff37297b5af57cb076a861e6ce544d031faecdc25da0b33dce29c9d80d8177ac0e87b2d0799f7313
+DIST gentoo-kernel-6.1.94-1.arm64.gpkg.tar 65546240 BLAKE2B 77859c8f96b54770d7afbeb30e370df0bb805594fe1dfaf4f1de8a6282be88b0d855bc823ffd93bbed52b72ab9a4a83cb22b86dd8f052504c795da49a4f7a2cc SHA512 b40c97a0a11fed8acd6ddbd8d46d2c0d3cb0e6751d772ad3a93e9a123eddc67175e64afa5b56cc4f993fbeba89a2e6e34199b4ccd0e48de9c68b0ffd1b15bb87
+DIST gentoo-kernel-6.1.94-1.ppc64le.gpkg.tar 59781120 BLAKE2B 7114326e226dccf92531b2b3062b7435ca98803f2a75e469f1c1aeac9d1f69d9170675acfe111bc7011b17b15d21162459efc0c750a41470a2ba0a29187a255c SHA512 08227e3ff6cf80ab9ba4c0f0e0b785e20c17904abc4aa64e1c2d9751da8c4a66de355342e2c98f1a7926b79b0c8e34b544c698b88aea9223d5401e608462b04c
+DIST gentoo-kernel-6.1.94-1.x86.gpkg.tar 62126080 BLAKE2B 2a10eedbd753715c463bbe073fa4f18c5c1471eb71a7c3e5543336b495a46c8c76559f9f2b9af92eb86e30bc9dd35f61c6c74ac8fdc5de1fd3a3775421df74a7 SHA512 65a09ca6bb307d24cc443043a834115215c8cb24a13421f3499ae39321d73b60f8b929c414ad6151af960d666e4cb7b5e16914088f59c0025d8977629c2724e9
 DIST gentoo-kernel-6.6.32-1.amd64.gpkg.tar 147384320 BLAKE2B cbb095a73c7d1131486110b342904eb1fe2a712b56d361a027fd964329321451158ec0e5a29a1f6709ba3f455efe7eb858c629a8a0a4eca244f6827de7e0264b SHA512 c711d6c86a57429c91037c87945616b4b99f1ff268336638591e06dbe37b791ca61236edafb174346b6695e78247793dc2e2a714ed48fdeb076f9d450cd1ba3d
 DIST gentoo-kernel-6.6.32-1.arm64.gpkg.tar 119357440 BLAKE2B d84d3d0cee04a1f545b97b675b4c84d411fb45ee5454aa0cdc4407b396a1b5623fed095e1dae4f6519947ee9669a7f338b6c4a5f200d3c34507d41a4da93f04c SHA512 8e979b6913220cd4df4dcbf2ff84ea516a3c17fa141862352d8924a0e9b817d98a6368aceab4bdb0476203831e32705bec11314136b5761f68107513a264176a
 DIST gentoo-kernel-6.6.32-1.ppc64le.gpkg.tar 64419840 BLAKE2B f65e2d413cc9fd362b5708da6376beabc92393ffef64ba20526a71f31525d5ca3a4c8dcb6c2c1da7abe7b3327abdf32a297986763cfa972335a1c94023c88141 SHA512 a074ccea453375f11943ede64ccfe00ab2f212057c2beae20b67ec85038bf0c7b320ff0aa1aa9175c992c0ed35eeb8b26dcad1fea144730f69e1ea99c43840a6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild
new file mode 100644
index 000000000000..1a845828a60b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.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/~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
+}