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

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

commit:     c1fadc737094f2af23004e6a43aa6971374d0e8a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 19:37:46 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 19:48:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fadc73

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 4ab22a66f438..de50fe5bf70a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-96.base.tar.xz 5079348 BLAKE2B 97ea3473a5189a92ea4478ff82051
 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
 DIST genpatches-6.1-97.extras.tar.xz 3812 BLAKE2B d76227c06153026771849653a004ba3474a895e8757c46bc943eee5e30eddb86c7ee50272b339def3c07224ff65ad09e0e6cdd84f5622d2f7e74ef56e7c3ddbb SHA512 b2df67590530801817fbb0d9bc1a317df5642af16147bb325ff562e3cd2796296592a12ecfc1775f6cf9302ae7740c3cf3ec9c8637c4bbf8f7a0893eaaaf1695
+DIST genpatches-6.1-98.base.tar.xz 5144484 BLAKE2B a337723a77e23789037ff71138906e1fe97dc14f928f2166de39a0d337998b11cd2decc91664f0d20e61632ed5b8870a9bbbcd5464ea83ac51769a16daa7757d SHA512 f1877eca1741c7b7d8e844fd8e9f47a228ea00803d5b352fc59d4af1d5e45a7bb817ee2953272e4ca49684df100875eb2d6f2fd3ed2165814c280ee588e9252b
+DIST genpatches-6.1-98.extras.tar.xz 3848 BLAKE2B c5092984f64c4b87256366831bc028613cb98b907b8fc162b0048f2f5185daa54021697f3ea783a56a531e036c504788b5d2e397994f18dc9c553a07b44877a2 SHA512 68a7e9ea763d2e1de5ecd8fa587338a1e72e94bddd88a295023d799a2150f584208d08eb2c451d0d0a951b08d42f5b1d6e3ef08433b4953d1ae77d729a9ae8e7
 DIST genpatches-6.6-35.base.tar.xz 1860992 BLAKE2B afeb95582f83a941d830e8a90d1b7e6275d6d43b41de93aeb01dc743b1afafc5d675d98b66b528899fe9e69fe856402059932be58487c74bfc0102cff748244a SHA512 bf2848bc7e668b8b8df410f22f66b575ccd3a4d160efc6ac5d3549e4d34dc10d81736d8dbf689e64414491d4bb5479c54ee8ba7d6ad9d3dcae7db1d15c13dff0
 DIST genpatches-6.6-35.extras.tar.xz 3704 BLAKE2B 23fe1a854b29b205e93ac82a796ed6eabbc96774648168f616c2366f647dedd5f5ebade68059bc7e9f8aad5b57c8b7577b6e098859484f35c07913cb4e3567a2 SHA512 37e311b153e411df00489bf4973e1a414b480c4f2d6ac488ddd8af3f717461b14c53143696628df3750168869cfcc3cfc209599454f9873e28ae1e1390198076
 DIST genpatches-6.6-36.base.tar.xz 1937600 BLAKE2B 8e3483fb9e7b3f6f63e97eb4dc66e7f0ea8c48fc22c17981d930d89fdb878fe0325fa7898df1baa8e8252a2ca122ab77e027e0e1da0881c9240a70d5dd912951 SHA512 8b66b6584b7d14ef3a897e4d71395340d6b350ed53a656988f40487da3819d403fdacc209df593459042d6c5f3ec4605f3e0d7cd78654cbcee9928ea022a6be6
@@ -36,6 +38,10 @@ DIST gentoo-kernel-6.1.88-1.amd64.gpkg.tar 72611840 BLAKE2B f7b4b5f674787e78b430
 DIST gentoo-kernel-6.1.88-1.arm64.gpkg.tar 65638400 BLAKE2B eb42a8c696c63e69d274f5f2b16d858f42c5d24b6c3516efa10fc1244ac2f17b25141ce9746d8fc7c05e422676a2eebbb93eb1f899479f02c3c6de1994faee2b SHA512 c75faa27e1f6b1bb9faa52cc4d69203026f10027cbf8b9c31207f0592b7319758fb7642b806a89e100a77f0f0df01b34cdec33b99638a596c0709a6c66b4d46d
 DIST gentoo-kernel-6.1.88-1.ppc64le.gpkg.tar 59883520 BLAKE2B 8fadc07f471cd104981a1eb05037084bbb13681c3f285ca7daa11eb57e28b3dd33eec7704c14c8b74007236fdde46e5d8f792668589c80270cbb09611cc19328 SHA512 c5f070fde1245240e131c36377425a0fcfe7997f2d5658b6b6368b0322e6166f23aab571968657906173a69737efaa920a22ecb191ad9ddea5dfbf9335138ef6
 DIST gentoo-kernel-6.1.88-1.x86.gpkg.tar 62197760 BLAKE2B c5530eb67503c436172e22f9821e2a0cd85977a839ed46dd74f35d99e61aeafaaa2c1fb3f9591fdcf815dead911b27e09d670e20c2d4b50a6919a44a0d4f4592 SHA512 d667523210de6e6ad650ec86f7390939246992442f4bd87c5e273023e9988df18ef2bd61b90417b4a2925ab5d26e9ca8e61a345b89545f0e9975b83d248d2a87
+DIST gentoo-kernel-6.1.89-1.amd64.gpkg.tar 72622080 BLAKE2B 5892a9eab6d10e5c427ed56d66b900e0a2704d7b06c23013f2617da0b9ed89bf0dc1175847ce62e272bc9c1668f861a057b76126076b1402719f5d8b8265287b SHA512 2613092660a4b34d01fb8cf0735b0950583ced6100266d9cb727e2801fc1c9ac93b8587a184eedb11ccb07551f6f46304f3c41627e9e4754c708f648a718655a
+DIST gentoo-kernel-6.1.89-1.arm64.gpkg.tar 65628160 BLAKE2B 65ab898e461000a4da01845841060ef034aeb84692e8e7a86567a77876989584e6a8b3d500c11a965343c6af27ea1b4ca0e44742aca330c5d6893d987ddab71b SHA512 5babf60b18e788001491062c45c9b9c40e20b6cd8ed5dd19fdf9a0157cfdd17b5faa7894b0330aee798f5f9d26aca33ef4da086e90696da8925f7819ff64542b
+DIST gentoo-kernel-6.1.89-1.ppc64le.gpkg.tar 59893760 BLAKE2B 83e12bc1ee386dffa018fef349c3e57d1fcf8486735a0e89daf75e67700d232c338d9c283f6b8a75ef911bc6235ba0d1d49bb01c408d135ffde76c2bda6c6bf0 SHA512 8c05cc60114c2dd8c5bb9b658f717592200677710b5bc7f1fcb6ed8acef287761deec7d6b8a3fefe53bbcd64b67d166dcab25c95576eca9262f1e12f4d60038b
+DIST gentoo-kernel-6.1.89-1.x86.gpkg.tar 62177280 BLAKE2B 0e608e202860b9194eacd9851cd8487b58792d43dd4a41582cde052494fec13bb1602da4e075c997b07685af4a83b913cf770c17c90a1543d6b47df0c98a3333 SHA512 06c481bde149a3cd064c79e9f4f7eb0a5c42e9a053b906bb6e8f84f23e19df46f433e4d5cbc9dee97a18697a800309c55bca1cd70d90ce5ea247190ec60d8c6a
 DIST gentoo-kernel-6.6.28-1.amd64.gpkg.tar 147210240 BLAKE2B d043e6ceefa8c0d294d37aea78b06b7b1c11970ad4f8d4a3f24e4fed28d6d9868277fa64eed455b21208b05accb9c9abca71c4da519ca4af830ddbbad7ffec7d SHA512 dbe14cf733b0628509790affcd5b313cdbd66e4176a889147150c109efcc1f07a008909a8f800ec11991bb1577e711e4cdcb8c7a1c032e351c7f99eebc369886
 DIST gentoo-kernel-6.6.28-1.arm64.gpkg.tar 119285760 BLAKE2B a62e4d589266b5e6f40c67fa19522ad075a72ac84b14cb27e25afab5a342b4a0d6dbef607e51d39f333c14da7b8fce5e74ccaf036ba4841b1ce78fcd0fa9d823 SHA512 5ed1c8ccc55d5f36a63a6d743f391825acf2b25d944ea7c1a162fdc14e14c7443c8ae5e4d5cb5b2c30250d68466b8c14c6aa340327baf34ee632e24d848e0345
 DIST gentoo-kernel-6.6.28-1.ppc64le.gpkg.tar 64378880 BLAKE2B 4c0c0727cb45d642d0c9e9d4a7a9052934d47ba3f921ae4534d11fbc28b9afb059b159abd3ae72e5a3c56a6d4a6b3044b994518b33324da97c3191b39d1fd16e SHA512 9a0593fb83b314f090f3d70891bfa2fd1b026f111197398e2f966f22c4a29ddd8bdd2cb52fcf24c25b85fff257a6dec7ece81bb11252a74b5716518e4d2ba35a

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