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

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

commit:     9d80a9c1b24c511af785e4c525ee6683086634d0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 13:05:05 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 13:05:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d80a9c1

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6d09e5db20b4..349e7c8ad53b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-100.base.tar.xz 5230656 BLAKE2B ce1e60a36233dfb26eefad5351fb
 DIST genpatches-6.1-100.extras.tar.xz 4048 BLAKE2B f8266ea5ef27224671f17cce493a10c02a0b93e4b904b608ec9953e7fdde42f0e89419d7d32f926a400bdda952aa87be2d9c66896e6fb120fdcd92b6473d5ddd SHA512 c044c5fe35ce29113d127b0ff34004d7125d45433ddbb3943549d0eae657a177a1bf037291c151b2ba3a9d35a89663031afa11f0bfd114531aa5bc54894cbb99
 DIST genpatches-6.1-101.base.tar.xz 5248940 BLAKE2B af64a685e905a51004350b263e6d5bf9078518a979bb5d192752672d15f54a1dd330ec71c33dde0dc6afce11f5d53bc62837ba400314978d740d4adfa3f32778 SHA512 fde5c4d51ba8cb095743d936e6b7e31ad4b7b04b46db66a4746d8fd03205a0b18a17e4d1d08210beaaff13557fd47a9752cd36a28abf19d879639c175cf755fd
 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-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a SHA512 39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf
 DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d
 DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e SHA512 e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1
@@ -70,6 +72,10 @@ DIST gentoo-kernel-6.1.92-1.amd64.gpkg.tar 72652800 BLAKE2B 14e28e212d799f070b6b
 DIST gentoo-kernel-6.1.92-1.arm64.gpkg.tar 65628160 BLAKE2B 68e76e064808c7ddce86be971ce370e1ee67f0b16aa0fa0a0c558621b4d3087150041d967251c4382808c13234a65ed186bd53c98bf5bcbc537b7c6bab79b862 SHA512 909efc952e243022c63122ec64812b9a10814022f98bad232da994c30c0a40e752267215dfa7a7e7089250ba9a8cebe2a33a22aae6cc831b98971b42d90cb725
 DIST gentoo-kernel-6.1.92-1.ppc64le.gpkg.tar 59904000 BLAKE2B cbdaf21da137dcb91d6cf0b5e38d43e6b09c7af21856ffc389a67e2308ecdebb364270bdc5a87eb94c2656052d78134d5c1676334bd37b686ba715438e02520a SHA512 adf7215407d640bad2fb248809207ef159e532dc5464bce0d7983c46ed2d394e4cb42a72357ddb9059feecbceadb67da51ddae3c7e7ae5a51eb8eeecbd26ae56
 DIST gentoo-kernel-6.1.92-1.x86.gpkg.tar 62197760 BLAKE2B fea6532a768902e805c13d85f03dd40fd284092b7aae680c6682da34fb3ab817c33c8fff45ee31ff18b37d19d13a85d0b79f61642c3affd7d77f7877d839e151 SHA512 df5763ffec138c840df67dac7877be196f7cc5b546e85ab0a24f1ab6da028ac0107ebc460f49a6b98a0d502e71b29d6140cdacadfd0cc8657ef91f8f773a957d
+DIST gentoo-kernel-6.1.93-1.amd64.gpkg.tar 72570880 BLAKE2B d58b164a87648f287c87305b7d5902a788989dad21e023c00c0d56d36e4bfd66897abb2952caf144f42dffa0add180ef896d454cbad96d6dd8556adb6f6f76f1 SHA512 20ec30b7491f1d2f92db595101cb09a5f0831ba8f52b8a8c3b252a36a6f7f38ccca2806cc91e7a111c396a4296f717cfe41dd3472c8a2343c3749a1f72add9b2
+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.6.30-1.amd64.gpkg.tar 147240960 BLAKE2B af0b3a2289bb6b4160bb03dfc4ecf85fcc7445f74cf966c47795ee1ea1884003cab8d57a8c9c166f0c2ebdd88c0c8c09f0d9ebf95de0d2b2f1496b1aa4f85788 SHA512 e0a6d1b773b9d7148399cf4aef99258c70ea09bd4b45b0892e8f02626a567f519cef6e12b8295d08406145fa4a38d61e6e8106f12fc5fea5eaca42dba01e5f7f
 DIST gentoo-kernel-6.6.30-1.arm64.gpkg.tar 119306240 BLAKE2B eb6a34e2a34873c64079dc0370bd750818af440eeb9fa2020c42755e4ce00774d80ab595fa2a35a5e706603ceafce03cf728750cd4d3148a4ef3ad897468fb4d SHA512 b05e624b34bb217137eaa3d984502a0408019b70c2230c380ba19264cdc586d6401802916e03863f6c36af933a095d0ebc53d3b880c6f7fb7d8bdf6bb9a60c10
 DIST gentoo-kernel-6.6.30-1.ppc64le.gpkg.tar 64389120 BLAKE2B db436724c0a978faabd8cf7ea6d4c6c1dc5c8537de25a95c6af142a3ef274612d4fedcb92a394f536c4f8431fe78e1cd946c5f2b7eead01fa9a0268f38870217 SHA512 cc01db0e74aef830c130e029eedd7072853413875cb436aaf1d34baef1f5fb1596b04fb16b9a2882c6625eefead272d1ba29de37afa43eae67ed97167ada9783

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