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

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

commit:     885b6545b2642cf9c5f1850f4bf44c291f9f7acb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 14:37:08 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:38:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885b6545

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 67dc8827506e..0ddffd2694a8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.1-33.base.tar.xz 1668040 BLAKE2B 60823b42a19d54af313039f75bbd4
 DIST genpatches-6.1-33.extras.tar.xz 3812 BLAKE2B 4c0552c0cd447cff8e1725dbcabe9ae02be41f432805b6e5e9fd360c6a0d745b5bb5d0dd5c7b36a3e0468622dcf89d3d7fcf47f0b1b1735f76ca281764c928ed SHA512 fc1efc3695e71daf5d3445758ba0af5a8714c22b9d3788f59bba0e4383dadc91ebb14e3114aa711b270c2734f3bd8355b6b7e98c9b81580b9da8c9ffe6207cae
 DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 9a7672bf2f106e0df50997d746171f80059627f84104b1919098fc75e2e01b0b262ea06905a768d8359fc3df9190b874413724529fa7107265ceab61d0f19af7 SHA512 678c5591831a779f852fcea89c807d256f937e3e01ba84b3b167274a1bd5c69ab20fd31b1f759d83986520223677c0e2e31bb3dfe624339b16fc45845ee8188a
 DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36 SHA512 13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
+DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425 SHA512 df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
+DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B 3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930 SHA512 4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
 DIST genpatches-6.2-18.base.tar.xz 995956 BLAKE2B 402258df823b898522612e18c9d0c51c38cdedc9b4934961989de768c8feb7ce0287f3354a75a97a2a0bcad13e74bbfadff8233b22ae816149f9eec85c8c6553 SHA512 1162522ff7d5a4408b1a1eb5d220822cd5e3db11c9948dcbc011dce67d3022d7af643cff81b2900e91957bebe0f00589bb7db93617e800dc3837f3f537eb1969
 DIST genpatches-6.2-18.extras.tar.xz 3808 BLAKE2B 4c80c3e537e6ea6ea2a9d720127bd5a661417ec94ddb373d6301334108c9765e985723475c85dd0acadce92811b7bd1a96f68cf657a4e943f8be49bddf641eb6 SHA512 8a63c7432326af46c1d9c5e3170f3cae77a35b3c7ccf4ece155418915ee21b511e7b32e7b377976773a5e188d43eb39dc8f435de269779b5192761f21414db37
 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7 SHA512 bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
@@ -74,6 +76,10 @@ DIST gentoo-kernel-6.1.29-1.amd64.gpkg.tar 76677120 BLAKE2B 360d61233d6aa7b96f14
 DIST gentoo-kernel-6.1.29-1.arm64.gpkg.tar 69304320 BLAKE2B 8e366960677d872deae0c6414e03cb5baf39c6d194eb76179c3954ac534424aa50919d78f570a10e47b02e5689772decd46f5c896942327a9697fe865c680b33 SHA512 5304b25ddfae5f752250209c7ee5bb694c25393990f38ffd1aeed1257888c1db6eb5c997efb4fe33b12338f0306a16d1932ca1879e1ad74d077415a07b80936a
 DIST gentoo-kernel-6.1.29-1.ppc64le.gpkg.tar 62720000 BLAKE2B c78cb1468fb8fe4006fe2e34c5d6aa4a4c6c5f951b3e3df3cf0db0fdd664a2a6a9d6a86fbaa9ee61bd20a92915d5623f82d3cdefdb849158d7f05993b9a46b21 SHA512 e53c491a7db231c6ec7d4ce74222de43dbe7019cc4193ca67771ab9bd7a5d2bf65adbee37a6549a16ec4d8131ea327351fba06440589033d09b789293d938cfe
 DIST gentoo-kernel-6.1.29-1.x86.gpkg.tar 66078720 BLAKE2B 7133ec541db6995d033835d7600f2c6ab5018cda0cc2b208548b26adf8db05c6c33370c004b1221bfa977cdde6a2a92ef53b5a002da1c1f1d23ddad4eff8e607 SHA512 c4ea2adf626deb54d7bacb621a944ba7ed4c7460f3fa35ddf0ad1c0b698b26bc82b3d95cf9dd00b5532a6608318ae2e93aa7dc961b11881070c6c1aeb40eab02
+DIST gentoo-kernel-6.1.30-1.amd64.gpkg.tar 76615680 BLAKE2B 695a07dfd7a1e2ebc4d6e5b7539fd69c62d6ff1a7deb9f03d49986a6eb813cce0971462f34105bed413084f7f5c415033da0050d1e0130aad432eefcbb139274 SHA512 cdb493d65526b9740dd521e7296945662e47467cafece7f1d95d0dd8f51ec619e7864d74844dc111269cf0f00a10721696d6241cae73ff817787360369809568
+DIST gentoo-kernel-6.1.30-1.arm64.gpkg.tar 69314560 BLAKE2B 8b2cd1a41b0b5866747692ff384473b9488d8cde39224ee9d3716e7902d02ccdacf3ad1e4c3362e46f13b2c95d382d2a16e34a38eb6c5184d57bc11ac317a104 SHA512 99d49cee001629db6b3c187c12480a099d4357d4e3f2c606a6252ade9a440d5085778f6fa62127967405ab2eba6867039877e4e638055ffc99c07e5199a76da7
+DIST gentoo-kernel-6.1.30-1.ppc64le.gpkg.tar 62720000 BLAKE2B 6f166db6bb269ebabe515619192c0e93278adaeec228cc400db4ceb951bd6dd84fbbff6dc23d5a6f5d61c9b2c0a88920a1eb5625998507d9a2ab693db43b2fa7 SHA512 fb9ca9bf10e6ee03f99d2301c8c17aad71979ae9ee12752f820db5604696bc3ab5a33f57ec1f4d05125cc047527be1d3f721d9ade936c108e1a1a2835844ab93
+DIST gentoo-kernel-6.1.30-1.x86.gpkg.tar 66068480 BLAKE2B 94816353dbcb1c002e479a0b486860bf6fc9afedfc461f634e21fc9a2538a5f9c412f9f5ce399d4cd5360e6161a0d743fb25b4772b40105a4a2a0cec0cc09ee7 SHA512 535fc8b6a5cf87a2c881226682dad6895bc21cc3665faa92027e88c6653b52502398a461415326cf8e802ef3af7c22d3d3da9babf3dd7f29552422b33d716ff9
 DIST gentoo-kernel-6.2.15-1.amd64.gpkg.tar 82698240 BLAKE2B 9fda0d955c58509d57a67f4d84054165d8f40bb906791ab0270f827502d6fe4c740659636817475614933d3d06859c59a32831d1325144749e6b7f65ffcb3c5b SHA512 696f99118d4df36477b2a3d73f463d2e0805e4fde334154471ef2e02bf20d26d7c35dca6e284c7e2828a12f6b8fad8ace44c51514bbed1ff2369394cf75ee601
 DIST gentoo-kernel-6.2.15-1.arm64.gpkg.tar 71813120 BLAKE2B 2549ccb428f778a10f0653005278b7317f32e9c2b4625f1ca7982b373daafd1539ff2e381ccbb2fca5785c0aeb6912844d88bb45230b077342c4386a49d815cb SHA512 bc788e87966012395e7bc4f031eba92bb3b4d85ba9a62c9d623813d7c166b718db022f0bcc1df13ce6152224a421fd7d8b68dbea12fb552c38efb3978f86ad15
 DIST gentoo-kernel-6.2.15-1.ppc64le.gpkg.tar 63948800 BLAKE2B 7ba131f8982c04bd42c40b94236a19edb4d7c54d35f43f80576869b3d6453f3e49ce1186f6a1c2dcad974a6c9d221e771c3648f985b8ca474fc112d116118adf SHA512 595bf5be2440f6a8d3bed48cba38e90127681385ab72c296312443f8ef446f05da661ed76fed0a31b5e90773993240d6f9add3ea43e276def833fad62bee61d8

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