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

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

commit:     f549b3bb821f19498f8080ff3812583508b9ac72
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 17:45:33 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 18:35:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f549b3bb

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e74760dbdf59..724e1e1ab96b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B a519f23086a440d560e5301b77aa
 DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682 SHA512 54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91
 DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
+DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26 SHA512 528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a
+DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B 020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8 SHA512 9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -26,6 +28,10 @@ DIST gentoo-kernel-6.1.31-1.amd64.gpkg.tar 76656640 BLAKE2B 7bf643f5c46e77546e30
 DIST gentoo-kernel-6.1.31-1.arm64.gpkg.tar 69324800 BLAKE2B 57169ac151443e6eba0b83a7973e154eb8b43175c5ff44c796ce85726cc1684470e77a77968b46937dd44cfad789053acbe04c2886bc39375c8b652b46f06abb SHA512 4a453f8a22c8bc99c6bb83377139e8d9a37e540a3ccac494762a7a49c93fee0d3c842aabcfa8e8df7a88db1a2439ca5b5165d9dfb889e5ee0780003b972f185a
 DIST gentoo-kernel-6.1.31-1.ppc64le.gpkg.tar 62720000 BLAKE2B de2262a2d4192e3002eb61ef6eeff85424684b3ff4f1f67ac9fd05c7bd33daa7d6b3576c5436a1ab7a7e9bfa741306e6c6f1a215f4b5a6aa939a5df9bfecd5d2 SHA512 f1675afd84a62c4f1552dbcdf6dd108ef5d4b11a1f7af695ae263f9c40976fcca678532a4c2b4c34485ee463e6f7c7ca7668c0ea8dd825f3a3e362839d19a455
 DIST gentoo-kernel-6.1.31-1.x86.gpkg.tar 66078720 BLAKE2B 377a8d5141d71d8510fa31d263b98f93feb75e4cd8fad0592b386430998dc875736339fc643332039d0fd1b8ad6a5e65bf4b6f8f2abae6516090d0c5e7939a87 SHA512 fa6fbe87941f9ac359e9bbdec4fd87ae13749afc1d36447d9250611b73661498a6f473b6e442e5c94af3a367374560bb44459c4c583db4da219e4c44dab375b7
+DIST gentoo-kernel-6.1.32-1.amd64.gpkg.tar 76666880 BLAKE2B a8404de47aa0ff56d9d95dd2197f66e873bac66b819d3c960d67b1958da518346f12612239eb91368b6237031866ad837b3edc7cdbea940acc8e0c7002e3c7a5 SHA512 525dd5fcabbafe24e829380d5910b4732a967fb010ee3a989c604ea8c242cee7e0695adb5cd0fb1043f83d1971d89b64be84c64adf1faeff2442340b42c68541
+DIST gentoo-kernel-6.1.32-1.arm64.gpkg.tar 69314560 BLAKE2B ca99caa48fd2319b16ac720a99decfc347fa3c64d487e967e1fe142f30ed45062831b8cfab488f11dde48c2eef2dfe7bacbf56087ea9c7eb20829de7f81eeeb0 SHA512 ac3ea9ca68c2171b6f4b064a0c3d004e034f9886062dc3eab1c74b3598a2da2a4bf1feb775726138de22ed7e20de6d78070b23cb2bbb703c1290778d494861f0
+DIST gentoo-kernel-6.1.32-1.ppc64le.gpkg.tar 62720000 BLAKE2B 53bf04c1cd5135dab83f1455cc15060c43696184169a6e58073641c9b3d752f768bd7731e21d66e2af386578190471b81a230dae91efc79981a115bd8e235690 SHA512 fe76bb3c46b4a62fd844852cb9039f91eaa40b1051ef1fd2928b47304b569d85abe8b12698a5d7b0c615289cc6a6abcfc33b04d80271ba58ef2db48f49cb2286
+DIST gentoo-kernel-6.1.32-1.x86.gpkg.tar 66068480 BLAKE2B 2cdf9137e3880e057af7983d4868ed935aa93ff59b674afff9089cd4778dc7882193a677852af2822cc56c3be938e60c38b65fe346432df0aa24ae737d6425a1 SHA512 37ba8029a2247bb4a5bde69d71d5c504a476f5bd5502a0ebcbb18b9d65cbfa5575c7fad62142b50bea88b6cf9bf71bec82795d2f27c7a763da6b1c81c65bd6ac
 DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8ca6b5a742a006cc6c6a1fd57760ffe72fd124d1ea3dbbc9361fc1f7ac4f64c3feaa2b213372cf72515577ae381c7921389db3e10d96 SHA512 9785a27d50e95c3dd9385b928b9dbc1e1056fd7cf999b4e1f675fa3ee724663671d8bb9de74a63588927cc5b984bfeff927e3ea9a26b12ef2009c7574804e490
 DIST gentoo-kernel-6.3.5-1.arm64.gpkg.tar 72386560 BLAKE2B b089996536ad9ac90e5fd382a490041baa3f7e2f4deb8945f961f454e042ef701bfb7ccc8259acca4a0a77fd104c6f0bea0a447aa90ee523eb42a4ef7eae72ce SHA512 1c666d1f210a81b2a803da4c3eab2c8464373cbbbe7b67ea2e6d3fd8bb786a6d13ecd9ece3d4dc7cb0b7487a3aa0eacfb80f9368d0b07d42c9ea7c0338659a63
 DIST gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar 64286720 BLAKE2B edfa70df90d9efca3394776bb30711f51a2dfd925d49cc5310ea985112b8c37deb3658581eb381d4128154acec9a39c369f9425aabf448a6d9d6a53f6796efe3 SHA512 bb551d9a588e2b801b4ce8d5a65a34b9eed1b965ee0843bf83193dd1692473fba9e576d81fcfa69f63418b056d9784f5ccbf36b5ea742d4cbf1098d64ec0b3bd

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.32.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.32.ebuild
new file mode 100644
index 000000000000..623c8b8ab75f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.32.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 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##*.} + 5 ))
+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="
+	sys-devel/bc
+	sys-devel/flex
+	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
+}