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

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

commit:     3930e04566d7a6cb6f0f41afef5f6cd4db61a347
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 16:20:17 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 17 16:21:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3930e045

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8f45db20a490..d414eff30574 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-168.base.tar.xz 6757748 BLAKE2B 32b6ebb14ed20864b51fef7cf5e
 DIST genpatches-5.15-168.extras.tar.xz 3972 BLAKE2B 6cde986105f72e9282c78f59c8bb82bd3ac7c5c03adb3b3c1c657204624df2a28048ac0fe095759d5906bcd6677831d9962894b76390c2861482440120e72fe5 SHA512 6e067603b8e0e318703a59347d38d7aeb44a3097c39df07881c0f5250207b05442053a8ddf32069ead729ab4c36ccc1177ee8d82417ae2dbe16014b221d0d1ad
 DIST genpatches-5.15-169.base.tar.xz 6804132 BLAKE2B 4c1bbb7881dc2fe1a15fb2baa3535b33d83421f029612567382d624afdf0e83bfcbcd34676f63c9d24cd5e91dca2e67b88b2d843ad8167bb0a423bb0de268a4b SHA512 abb6870976a156e548800e45cdff3b4aa4db723f4b6866dbfb3b6437707990d74bad4f0ca916b0e313350c8bcfeff13542089f102fc99cc3eb899349cecca7be
 DIST genpatches-5.15-169.extras.tar.xz 4048 BLAKE2B 422d0230026956391a9493a7363a6099b07ff5e16799a4ef194a177b2fc84c1db666e3cc326e5648052a0a76a87367fc94dde8cc8307ac36c412c0ad85d0d370 SHA512 287ce1ffecb61297c55465b223d8fb86a84ca4805856fcdb605fd43ed81b579aaa64f696d4a2687a95c312ea285e05ccea8a3589c911f99dd4628609155c7422
+DIST genpatches-6.1-100.base.tar.xz 5230656 BLAKE2B ce1e60a36233dfb26eefad5351fb71d8374fb673fc117fbf37ced214f678c642c0fe0e898d6136fdc99504c3b1ba094c372143fa94bca87efe0a63c184256229 SHA512 ae3ca97ba86715c0a6b9a4888c7b5b262becbbf5262e868e171e9738f212701855f2a1e6587908e5008f524b546d3fcc9f0c671286e5868d67edaf3a92a141cb
+DIST genpatches-6.1-100.extras.tar.xz 4048 BLAKE2B f8266ea5ef27224671f17cce493a10c02a0b93e4b904b608ec9953e7fdde42f0e89419d7d32f926a400bdda952aa87be2d9c66896e6fb120fdcd92b6473d5ddd SHA512 c044c5fe35ce29113d127b0ff34004d7125d45433ddbb3943549d0eae657a177a1bf037291c151b2ba3a9d35a89663031afa11f0bfd114531aa5bc54894cbb99
 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
@@ -32,6 +34,10 @@ DIST gentoo-kernel-6.1.90-1.amd64.gpkg.tar 72663040 BLAKE2B 6dbe6f600813818ffc46
 DIST gentoo-kernel-6.1.90-1.arm64.gpkg.tar 65628160 BLAKE2B a8bc732862da36778119a7d0ce254ce43e72057ea15130f8bcbda0a66ad11fe4dbbb7befcac9d94fbbcbbea072fbab7728ae25eebea7b2ba59e2d8ae2870331c SHA512 53e3854942b596fe76025f0e782f476fc557e4fde1e7a505734af334903687744b9e9c4269742c6bde0bb101ea77263f315c47a8180cbde4cbccd641f6af5f09
 DIST gentoo-kernel-6.1.90-1.ppc64le.gpkg.tar 59883520 BLAKE2B e76649abaaa9c677ef517a84a587e3f110baa0b9e16d208197048f7aa39a6af10eb10649071e6af81afe8a834c86afd62063942aff7f79ddf62c2e1fd80b2d79 SHA512 6bbe5303c41d83d79e567ecc172fdcb5bfbaac1065b045363d486bd1a8a8cb2c9a2670432fee05463db79cdb99aa6c20c1379f51472d3da8f1455eb485ab4782
 DIST gentoo-kernel-6.1.90-1.x86.gpkg.tar 62177280 BLAKE2B a94404b8b8686c827262328dc9838be5165c354d8511ac467b88f682d7682b120b5e68b38ad5a082eca0d0f8c24f7a4ace540f3f7903b222bb499d488d847038 SHA512 29ae3125a062d276a7ac2cc8a0c8d2ceedde9b14e491dd0384ca90741ba756b64997576deb528b2d7241abbac698112b250c57a9dde185f8b070833274ae1e0a
+DIST gentoo-kernel-6.1.91-1.amd64.gpkg.tar 72652800 BLAKE2B 5ea8317d4b3523c05433496b3234f2a70b3a9e39ba034f42b0fc267392b13bf72d3327389034e90c1b50ffa97a39d88d11d567af9d05a007aff1aa6b298fba84 SHA512 296119140b9ac4b38a7e64efc260eefde2526516f738b2126efec45bb1eaba30cf408aa58b4cb9aaced7bdcde67976c3eb29ed6ad90babd57893aaa9ddd6f269
+DIST gentoo-kernel-6.1.91-1.arm64.gpkg.tar 65638400 BLAKE2B 1cf3a711045950e18bedf01111d0e0208f61cea6c8dd723413e464f7b60f579c20e87d9e2a9b6acfafb6670fb084858b598e2e80cc988c4e7d4f131619260002 SHA512 cf3311fb2c50253d332f9ed87d67a53943c2b01d2273df63f6ecc5adbb3b71398b95d8e13b4dbf7dbd25d48a79bd1fc1709ab980d0c2149c3f029839bddca0da
+DIST gentoo-kernel-6.1.91-1.ppc64le.gpkg.tar 59893760 BLAKE2B a9ca3cfb32b85499c6ae9f4d28cbad37a9c3e4893c5a4f63b6efc4563e54c2a92535f2400af5a9f157df6c7d1fa6378897310f7cacbdfd9862fe15d0ee3ecc5c SHA512 cb9417b649e6a88dd0ccfcf074733fb78f756d79fa717abfe88ab9d3962a24d304f3fd35908b1886fa591c9b09e5bd032a325aba71ac32bf9c86acae1e0c694b
+DIST gentoo-kernel-6.1.91-1.x86.gpkg.tar 62197760 BLAKE2B 41cecec740f456166cc755deed964eab9ed6e5984578ced9dbb3d51b6fdd34ff7f7c782d06d7bb9e6758904ddbeb8afbd69756ce21ac32ed043e66373d149ef9 SHA512 edf4658b79a2aadbc273b766c6066eb312dcf3d6c4520b906d46991b11a37da5235a3a749e36d82b898d5272d779dfa698e63bf9e1c658deadbe0a52d27a6e2c
 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.91.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.91.ebuild
new file mode 100644
index 000000000000..1a845828a60b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.91.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
+}