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

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

commit:     2bf3ee300147e0298997fe80a1550da34f2b0bcf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 16:43:49 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 16:46:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf3ee30

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e1a6245c9589..ab37d09387fb 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.1-16.base.tar.xz 820936 BLAKE2B 91554b3c532c7ba9549291a2a6c3ae
 DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 72e1824ad6d561359eb287c8f67d94b961c6054a4bbc66af9571caced021d6d3cf64d5d06be4977c22b4c1061b37b5f174db4713040faac069dd9e7b29fa2a6f SHA512 ac2c48ed858be0a2c844646d343de6994f1f8179b0369a6be554f1587369679b651304f967346aa1bf2f462ae62b1c8c0fcb5bca32ec12e2f6100a694aafc6b2
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
+DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
+DIST genpatches-6.2-4.extras.tar.xz 3804 BLAKE2B 909c69169a518c690e62cb3417a35fdcbc1f3102d388ea0f6eb5329753f50596bae769ef033d43bc9d9fc5cbddecc3ca8541f771c4e02c76fad6253594cf5e5b SHA512 c22a12ea1d3467891286d9898582d038026230181537ae40927182b9549e7a768e4ae62ddf9b402e67cd31e18cb64e9f9567c5037eebc98500d4aa21ea62b44d
 DIST gentoo-kernel-5.10.167-1.amd64.gpkg.tar 66293760 BLAKE2B 86933f7a1da3888fcc8ce67602b49afcb22e442bf125eac3acd0e15169832cc16221603cdc95f7d343b0885329dea59613f551f77dbd64be92e991ce07d8e26a SHA512 c267a31e2800863fbd2fe3b1ed5570cf36263764df53845bc25762ebee49e268e9175b4f5d61d4ee67a4132f9af3e5d360b0426f4c350140d301506c0341215a
 DIST gentoo-kernel-5.10.167-1.arm64.gpkg.tar 59351040 BLAKE2B f8e0ba24eb686e38704fce1c296c978105f953b801ada73eb83f03f9dcee542d223e23e103281035e1e7f78be2bceba52616f84dbc998fc391e6ed136b6ea9ec SHA512 5d373fe35cee7142af63fac61282d2e71e5b9c80bac7c03ac3987a058aee7ac4915bebfab02cc995ff1344070d158a83d042dbb6573fe0bf5d13b9656e60f07d
 DIST gentoo-kernel-5.10.167-1.ppc64le.gpkg.tar 54906880 BLAKE2B 85f324ca7221ba94b2fddf364b3e3b2f2e95549453f9b5d938ab6f711a4bc719559ef8f4e9b6adf259e7864877b888ddf09f5c22054164f098abfc0d2c71556b SHA512 b4cacbdeb21ba0d1f72afbbd321f696aab71c150fd936e0e365c45df2d4fb7bc35e397fb32c788dbed8f45275225560e0bc894c724afcf23ae5dcf9bd507f897
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.2.1-1.amd64.gpkg.tar 83271680 BLAKE2B 84f16715dd8119c529e56
 DIST gentoo-kernel-6.2.1-1.arm64.gpkg.tar 71649280 BLAKE2B d7acf954906471cf63a581604fc522c109ee884ec7b4d8cde182c7589810bce536b72f22d5306196d066b1996e937b400c2d88cb8ed586c112e4126918d8d3df SHA512 02033ccf80ddc88c174ad299b2ec42e370fb9736f26f71e5131aa4ab582824a01385613258fee5d1453189c7bcc32511e38b5b8c766f1fffb1a760dbe6d7ba94
 DIST gentoo-kernel-6.2.1-1.ppc64le.gpkg.tar 63713280 BLAKE2B b0d8a048fb3a8bc8dc8cda7174e2906ca73d462b395fd601b2dea3476f6491fe19b95af7477328c1f3a065b06f0a9e9bcda369a4752cdfb3d036fbdaa219febf SHA512 793f5b5459176323d43995955c722973afaf96e7457c53cef61eb79f52373ea646cc3e7143c296b1904e062fcd871ded092d376d4a4b2c61bd5ff2a42297ccbf
 DIST gentoo-kernel-6.2.1-1.x86.gpkg.tar 66713600 BLAKE2B f3e91d0138966403e4931a50e9818d5a28c7e3632fd06cd13dede2df63c5d8d87f177ddce6afea3bbb75215e174da4d38e8ad1194e2e5f94514e1c0b0e5e4b2a SHA512 67b7375cef6c87ca31d7c87c166b8828291bc978e44bda910515993c1c8bfab2c53bf864f919c75c741b49588ca3ed1936db7379855a1b6ddda737fc12d68282
+DIST gentoo-kernel-6.2.2-1.amd64.gpkg.tar 83261440 BLAKE2B 083864d6c45593c9ee8498ec1165b244064c3a33367897367c758ad4439f5ec5783257710b1a5dc67cfc936065540347e263ebb437286bf01bd5fa1850e211a2 SHA512 b2cb8df37fc416acda2fcc09ca917d6b6f00ae505bc361e1354debbc15ad760b536cf0632c142a59919ae77e1a0b61cd6e52935fdc185c25f6fc43d7712ac6b1
+DIST gentoo-kernel-6.2.2-1.arm64.gpkg.tar 71649280 BLAKE2B 81232783c3f42b1701817d475d50b31c990308d9e9018dcc93b3ae85e174d7e98fa4309eedcfd13bb3d9808d26a74c42f2d307e0db2793ee0a0f483b64792e6d SHA512 c1c49d7bdd567deae47dd5340a4f6ce03b9c19a27cdf331993947acc45fae67de3a61cc42a122ff0f55e51137cd21ec1b27f0611b8983d3008abe7310d2827e5
+DIST gentoo-kernel-6.2.2-1.ppc64le.gpkg.tar 63723520 BLAKE2B ef5de59f98854d9398125320345457f479edf2b72012c2be39ff1f547187134fd648b06cb4a026045aa093ae6602e76d7eb36987c5f4908f6796799299013d26 SHA512 1881756c7ee4f705d4e5400bc3a54b16ff2133439914f34ee55e86a148715924c79d8232846bd4b16db2165ed9d5ba66ad7ebab7ebb6360a044eddb088fc73a7
+DIST gentoo-kernel-6.2.2-1.x86.gpkg.tar 66703360 BLAKE2B 0cee6dce4e265fbb81dfa2845127b1d13ce5a817a901e19b10331b84d325107fd6611d4a0e2281e997ed29f115dfbcbfe4fea374ced78abd4e14dd7f1bececc3 SHA512 720b08b4106882973296614e2344ac025191c144a46bf9347d80338e4b518fd2ddb2dbb344f9876e92d3296e4ccecf68fe72dc56747d43c4f70ef2d1eacacab1
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.2.ebuild
new file mode 100644
index 000000000000..ed76d510db0b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.2.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##*.} + 2 ))
+BINPKG=${P/-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
+}