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

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

commit:     c1127254d403ea6982ee8080b8abfaa7e75960af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 08:00:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 11 08:00:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1127254

sys-kernel/gentoo-kernel-bin: Bump to 6.3.1-r1

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9c06e767edd5..ab271aa4ad99 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.2-16.base.tar.xz 768864 BLAKE2B e852e0feb635be67bbf0da77ca6c94
 DIST genpatches-6.2-16.extras.tar.xz 3812 BLAKE2B ffc7e5852ee193ff8bf364ae77394e10c0d9cf8f21ec4f9886d87803be3f6152e632990be009b68f3910ba3e95d7c2bd30c37d6cbf5c49cccf497dffd12f62a5 SHA512 b17df7f12e2c50bfaab0a0a865e1a7687f058e6b4d6fdcd1b107c690e6869e8ad5c127a51ea64b55ce3dc57d74da05fa075f9d99fb3f0b24dbe6dee5d7fb4402
 DIST genpatches-6.3-2.base.tar.xz 8036 BLAKE2B 754d46f15ab113a1bae41d154b47c4cde2a93df9dbc4333b93e7d3abc424ef19dca2993c25705020096ab9d500f794a852c4cff68f29907e7667edbec7503ff6 SHA512 45eb038e9118a2feff7625cefc7bbb96ef4fd8fa29fce118943dbd0685075fbf9c525202879abf6308d7e80e94b8e9704799e3c863105add026c86b97314d580
 DIST genpatches-6.3-2.extras.tar.xz 3808 BLAKE2B 6eccde5d3591804ef50d800dc7ec4cb8b2192d805832cde3496c519bf4ff0f9eef62a76f1e77677df66a054ed1f1efe341f71b8f86b185b10145de8200bc2c70 SHA512 8d79b8c2eed3c962a4c8fda80934720a2ee1436d4e42d762d3f945972537491f415aa6b3615f7a81a727bbb239cd0277ecfb18c83a90ba57252674bf135b35f8
+DIST genpatches-6.3-3.base.tar.xz 9340 BLAKE2B e163214c2f648a410b6253caf1cd2fa60beff29341cfba23674cf41712e11893c1f9574a1bfc4df797e69900a3a3f18e65399f5be720c58ab32c5780a41891c4 SHA512 8d308cac9a26c32688588fc8aa34f6798f5c0334fa01f3b813922ab46f0d53cde6c94a5c71817f929c5fd4f96741380da1d97c6ba6a3a5091549651c32fc99c9
+DIST genpatches-6.3-3.extras.tar.xz 3804 BLAKE2B 53064668f5f323d3146f16e96a7864ec41048fcc632aad93ce2c5e2b81f496e9b3f50c7730adfb8d4032d69c7277002419bd17d2698c4a1c4fa97ff86bb56411 SHA512 b24a3dee17f10bb60674792522ac6c39ad891bfd46e0c710fef554eb7393446c0071cac74f46507f9ffb206c798bbf881c2690743c33cd40dedcb41ded592a88
 DIST gentoo-kernel-5.10.177-1.amd64.gpkg.tar 66334720 BLAKE2B 87d02bab9e9d14388e984b3a712e00b85ae14ee57040acbd9948f64173166337e2939a73cb787d172365fd4f6ebc42677cf3fa52b33f7017549d7de373301527 SHA512 f77551f0df9d37befee7f310f05f5e221cab19fe29b21d788c515a4cf55071456d00f232115525e541b94f9a0ce6713f5c764ab49119333d337a043888d61e85
 DIST gentoo-kernel-5.10.177-1.arm64.gpkg.tar 59361280 BLAKE2B ab78f801631243a1767abfb1e950206e72d030438bc9d6434900c5795686f9cc9cd7c804bd85153126f4206f2e1b3774f8288b1419d561492c210b030dca5ff4 SHA512 83434e8b1d6050e48967abe37e923e16a8111c0ed30773d016b80d34ff6caf52c27e10af9598e653d823a2f89e73a04c7f675ae027c248543cff72f87be04fc4
 DIST gentoo-kernel-5.10.177-1.ppc64le.gpkg.tar 54917120 BLAKE2B 5a86c6beacd641530e3d1d36b8730ee8c223f9d537922b6cfaf32629bb8ef85074d456536a2f861381398731dba633255372957bf6f79951f4c919f0c160c773 SHA512 b9f69167a9d9a74fde75eebf7d645fde1092ef785441ac6b57eaa37fbda9351e8a2e02b1659cf32d08c057f97ee7ca9865c57f014fd2b1e5ecadbdce912edec4
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.3.1-1.amd64.gpkg.tar 83415040 BLAKE2B 25b01c8ce51ae47c9ac32
 DIST gentoo-kernel-6.3.1-1.arm64.gpkg.tar 72376320 BLAKE2B 7bcbf05310a57d5d8417b13f94031f6876aa37108c8077a97c6d9e6ef67bc5052527319c0bdb9d470eaf398e6ba719079a8b4a121f900355343366c7ed749d4c SHA512 12ad556ed9b52774485de2e0a625a2fe3557425ad8c3971eb0988ac85ae17cbe4ab1bce5e8360cd28b12bf731edc1f6c8c60fffa86240fb45adc9ac8a7f12341
 DIST gentoo-kernel-6.3.1-1.ppc64le.gpkg.tar 64256000 BLAKE2B 4c094238f14f221fd42598b6dde1486e07f0998b51d834428ec294aa027d04e8f9dedf6c5d9129a12bf361ea4f009f5271b8bf542575e5dbc056d14eec4752cd SHA512 33ab3fc05bec10552e58796efaf63ae507af546b6edee2ec6111eca564aba71be1de00a1427386f0102b0cbe10b44e35ec8a2bc44f1d0a799bec7fcc2d85c695
 DIST gentoo-kernel-6.3.1-1.x86.gpkg.tar 67010560 BLAKE2B f3303c11d75dde5dbbd1d085845797a204ce72b00531befea8da2dc0a9aef38f30479d4a76108459e3de76b9af2f7e5cbc850959eb9fa242773aa1549d4c1b08 SHA512 ac74af18e7a687571154b6b9e7597902106fae65a3f1a4c1d56cc2ffbc6e93812756717040e698dce0fd3a39c82a656ef958347af985c74c6505cd5bb0577129
+DIST gentoo-kernel-6.3.1-r1-1.amd64.gpkg.tar 83425280 BLAKE2B 848da3136de1ba5d71482a8ecdf3d6e9140240652f52c8d98f75833b4f089f3af9016dcb77337bafd89c438b000ee9c994e91f86f25c108e6f80e4e6c3f55e9e SHA512 46cf90149cd19fc994e4d231913566e1f18dc4886ae7f0367cecdb7789c2d0daaed835f3846bc6231c95efee02ba18b9207fbc830f6eb41f33ec29f144cf4d6b
+DIST gentoo-kernel-6.3.1-r1-1.arm64.gpkg.tar 72386560 BLAKE2B ba5fd61262956a554124a10a93d074d7d246895a6e1399eb4838b737c26a3a8ecb17e8f8f91cedf2f2800a8ee65280d327b3fe3e823ea918865d8f8f5ef92b34 SHA512 422c318c01954dbc3a18b89051da74d8ae72ea56f5f89c1e2e2fd19d418c79263c3c5ec6c726d635c080f564d052c7a4ff94a32f6092e0216ce43ee268b140a7
+DIST gentoo-kernel-6.3.1-r1-1.ppc64le.gpkg.tar 64266240 BLAKE2B c8fe83d2dbbc1e4dd7ecd6f7f9d95a3e378ec620bcbff1d186098811842d0cd36754da4621cdc3edd2a389cdda02a34281475e2ba116c43446eab35bdd46a8ef SHA512 7dbd51f928ce5e0a971351a83894aa1216a263d37f90e431a30f47ff8f46d5ad1709caf1bad71aa016b95bf3e6406e7a5a72ab1960ad8fbbb06b47fba675f741
+DIST gentoo-kernel-6.3.1-r1-1.x86.gpkg.tar 67010560 BLAKE2B 2bcac3e4eade5206782afbae2df221a47b9a4d45d8a1d375f7f93a9c293f5f4ab04d6f8562429070a2c9643ebf0c11848c64d0c9408d83af85ce0bf4aeef3f4f SHA512 13808c2717c7d87031e2224805354b347432275d17bf578d2180fe7de42d25262a16d4ee63ae02fa7cc6ad7d43aa267f2b23480f400ce46786a9bc469e79b1ed
 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.1-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.1-r1.ebuild
new file mode 100644
index 000000000000..3cd8c6516903
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.1-r1.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=${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
+}