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

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

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

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 595a152db147..e74760dbdf59 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb0
 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 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
+DIST genpatches-6.3-9.extras.tar.xz 3804 BLAKE2B 3a5ad597a1379c076fd5fd04b5b483572c1bc50ea53ff416af5ce331b6f6249324cf90a448b547a0e3f28a367146a624ba8801654e41041af96de6d457125374 SHA512 4e4ff68a7577a03f9573eeb09d688e320c64ed72d2c56c2faecfa96efad0bd7c2451ac3141fd9e19d94e2735ed5c9c692b52c17fe64a2ff280c5b1631d6ffdb8
 DIST gentoo-kernel-5.10.181-1.amd64.gpkg.tar 66344960 BLAKE2B 695a7b9e525e215bcfa0f69e995f2687adb936aaec09d95ed6f03dc32f4d6d768325788c16b0dc12dbfe07e4474063f3163bcc5db488d92f3d1ee78bbf7e1909 SHA512 d6f20cd7e8babe53b6a18e5d95e8d41d6c476b3003b6741472cde9f1ddf786506a1a3c8b3a66a71cfb30d5dccd7a112021a4f5c0fe2900c9f014280094a49e9d
 DIST gentoo-kernel-5.10.181-1.arm64.gpkg.tar 59361280 BLAKE2B 9f865ca04c20ddce039515d6186f0898db5b6d3795cd4f1726f8342b145698d5395c9ddf091b85028b47b8c14daba5c1ec2a1eb067eb61630d50e8a126413abb SHA512 e01378cbe070aa028c31252d3dd5fa7eeebc9be4bf5931a6480c66fd35abe1dc912f52bc03749eac2e8c751e3628026fcb7f97c0b4bd303e8300eeeb3b31c758
 DIST gentoo-kernel-5.10.181-1.ppc64le.gpkg.tar 54937600 BLAKE2B af93d42efe22e9b2cdc4c6914640f048b59e7b7e8953d4f140d825060475d5cce9fa3822bad953c4b8c210b65a00df310ba20fb55572973039ed3fd21bf5de8c SHA512 146f87ff17cf4c26e8450d5904c359481893426104479ccb009b384e4643f6b7802295fc4c42fbe7e42d8ec70ec42c4078e721d6c39c173348753a9d3d244c7e
@@ -28,6 +30,10 @@ DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8
 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
 DIST gentoo-kernel-6.3.5-1.x86.gpkg.tar 67031040 BLAKE2B d26e5786369f939f07017497748eedcd5ea41abfc5a2a1e4b60c91170b8e18d25d967e62daebd0c80263c6cdd39c9c57b6babff5bc5e8550b50a3ecc4ef1b7e8 SHA512 03347b81892411944082da429015ab5d9e68337aa4fb882329fd7d8c7ae644de44da4ec893507f6657f2663b3d01f53eebafb0bb88daa6125190523ad9d96c2e
+DIST gentoo-kernel-6.3.6-1.amd64.gpkg.tar 83456000 BLAKE2B d4004efd7df9e2cc35f49ff8c558fc320b24ec36392a5ce6eeb6184c8ba515b088da31befffd3bf4d95b25876a9dd76f833cc478291e094f41de6f082575dddf SHA512 59bf6e9043e9707230e245af30345e65ac6292f107d34ddaf0b9dcdcaa5710f5abd66e9e6d0f827f3789cf2a08868e6d292a6f0b892e5ea9c13862fa7a9a09bb
+DIST gentoo-kernel-6.3.6-1.arm64.gpkg.tar 72386560 BLAKE2B eddfb099f35d118d98d46647a8330bfb9b33e4aa462e70b7bcf38f8139eb18aa267f720db2fc54cdbc09159441658dcfacee677209f81667ad4e8fe40a2ccdfb SHA512 7b543fcf9e0b26cb3eb135c6eb42d4eb7204eb878558d67befeba9d33182600054643b3e9a99bc14a95e5639d01b5f8755063c9381a3111800511a5ca7c909e6
+DIST gentoo-kernel-6.3.6-1.ppc64le.gpkg.tar 64276480 BLAKE2B 21417c7200e4755fa9f0506a39078a4bd04eda8ada59f0d9c9bc6e8fa2e8ed71bd968e717803f074a880287e7644e8b58b0a2dde0a4dbf1f2134ea3067e5b3ca SHA512 95797b412d1f1540ae3fa6f427a58071c4b8d07bc376463dd9ec1b57c4c272d048a2a045c2697f2d8c858c9eec20fb607a7ea972febe6f479357590859a275cc
+DIST gentoo-kernel-6.3.6-1.x86.gpkg.tar 67041280 BLAKE2B 44ad99201580e385bb7ec61a2caa3ef29d3f290d5f0a46c141616d647cef3504b4f4089ce7b9faf087460932102dea8eba49d1e5fa7b040810dfce1b09ae5ffc SHA512 215701507f8cd8e8164374bf2cb951a3982a8930fdbc1c7e4ccd0c1d297107bb19d300972c1954971be7fc490aa6a63307c5137364a0dc4ee03e35c19357d128
 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.3.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.6.ebuild
new file mode 100644
index 000000000000..ff865204fd12
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.6.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##*.} + 3 ))
+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
+}