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

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

commit:     1b012892981fa21bbf6971accbf46d5d30f88002
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 09:05:18 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 09:08:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b012892

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.10.125.ebuild              | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f902c956f405..653e343fa574 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-132.base.tar.xz 3685068 BLAKE2B f46967d4a4fc013f6b7edb2e8ff
 DIST genpatches-5.10-132.extras.tar.xz 3868 BLAKE2B 207e7a4bd474202ad112c450b49e8ef3ead28eadfd1e35916a7ed7d2439c9b435ca2a6ccbb56a6e761b59580751c85993d3ffb6ade8908b8f1993638ac8cfa20 SHA512 ffdf7573a027e5fae644ab22358bdcf74c7d023e28d3cbd08f01dfc02f6776956320cd1bf4e91568de64bb6eaa88682f393a257233b310133f35b2badb4bee46
 DIST genpatches-5.10-133.base.tar.xz 3705140 BLAKE2B ea0136c10a49158b3baff338a098c00729cce01d1ef0c1d08b7f2e225d3e10b4b039be9d5265b93d55e7069752d9c224797b4bfe1032ea10910a4e70b78c0121 SHA512 fd2e06fb495c020768d671925301e359008f1c51fa49fffbb1cf8dc23b5793ecd1b563d2729b312a9929ca8df9a5bfa2f3bcdc4e4a099d299f80f65de9055882
 DIST genpatches-5.10-133.extras.tar.xz 3868 BLAKE2B 30b7a0fc22202becd9b3517aff1f4ac797f6dd1437b108d5c694307641e158c68078514d7c2e32456162ee558659391092ee6e8e5cd0e7d620481563165605d0 SHA512 8e3ad4883726c772d2988ce9618c8fd1236760ca87c6645e1c7bab99fd540ae9cc1371a566bcfcb52bd816e3c21f5c83821b4e77831efe4f1b89eea63b3ff544
+DIST genpatches-5.10-134.base.tar.xz 3707528 BLAKE2B e601b3a289541d53c140ebbc3616f5e12d642490148e579bb681ca866841998e05ede2afeba018b671a1ab471d284a015b781b725e4a3449ab93ce00e4c794ad SHA512 a5103de1223d9cf9431bf58ce76d58a7f8a6491a4301697d0011221e67c4e230e42c3eadc0c3882213b05d3a4baa7bbbbe0136530fb94e702ad43cd863740e7a
+DIST genpatches-5.10-134.extras.tar.xz 3868 BLAKE2B 85ed4b88733e22c7b0500719b0553b5f58d3f2195ce17b01f750c6af339579a5d7b043b7c9e29439318cbc4af4b834d4dc2f35bd42afa3d933f8f2c0a5b0a4e4 SHA512 24342bee361389b44f795f80af7b4142652c3c27b40281b96ebd9e844c1974a626c5801d9840826693dfaaabb06ffc8fb54b184b41b6a3a0b3cc8f41f836e468
 DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
 DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
 DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2 SHA512 bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39
@@ -24,6 +26,10 @@ DIST gentoo-kernel-5.10.124-1.amd64.xpak 65750678 BLAKE2B 7c5aba8025747fb872d223
 DIST gentoo-kernel-5.10.124-1.arm64.xpak 60991795 BLAKE2B 9000d7ebfdf64ebfbc1619f547934c9c3d6fec43780b3445dd8c4302472617cc1e249c517a622eddb188fc583df60bc0422e81eb320cf2c866b83ff80e1a4740 SHA512 348291182f4c8a12f26e5a174f15d6ae68964aed66f4cbc2ea3e75c39ef9de577edaa406b603c9d10bb39231ed6fb3990246dc94f206d0c34157c03f5c11312c
 DIST gentoo-kernel-5.10.124-1.ppc64le.xpak 55962124 BLAKE2B 93a669e91bf71bf2ee1c9a857dbda561f372152e1c335146ba3438a29747f8686b99aebee32fb88cd44eafecebb3cdcea4d6881cb3a5228aa830a183995d7c5d SHA512 82afa602dd74fe82db24f0108b9f3d30f0ac06e981924fea577b25c013af58bf77443e22a8fde36f0ae9a57eccb08612e4ceb2f0a5355bebd40f9a055f710b2a
 DIST gentoo-kernel-5.10.124-1.x86.xpak 57414241 BLAKE2B 5f4e2a31eb347d4fe8755c3036671d46749ab664e4368ea8a4592ce675da5e8e6f89af69fb8d11cd329b8415ed386de772cfda3358e0e94758fc7f7cceb408b8 SHA512 5a3fdc49fce343fbb7a519a1c073d720cdef73c102f46a8d7218957ec4a1dadd8ad76bcdc86ac334d329ef3c55b7bc06d3b6c003cae403a8b3e806dd60ce11c0
+DIST gentoo-kernel-5.10.125-1.amd64.xpak 65790587 BLAKE2B b33040fa34e7766cbc4b16d8927dbbe877542aaba5146e0f8669dd502cb25552a31c08deb9e2a1a7b26ccb1e3eb045d16f115d5aaa1375edfb55483ac6075f13 SHA512 81985f35243ae42c7d94a09a2337c13f191b91e8ba9b754019ec902103909551cdcf2ee96445ee0ae609b381fc93f5a53c4c615ec55a52d0d5062ff103438328
+DIST gentoo-kernel-5.10.125-1.arm64.xpak 60992458 BLAKE2B 4a684cda60e3506a4b9c0b7d4c611da0d1d6a2b5b418985a6b75dd84a46ff27db387509a80bf7374e401e0e28f7e3efd511dd1c78286647c8b71137efba49f82 SHA512 02dc2028ce036b3f72b16c2c037eecf385de22c653a6fce868595b2fe7cf07f619a4e7ed0171f138e152f9eaca753920d5baf1b037e143431b983eaad6664240
+DIST gentoo-kernel-5.10.125-1.ppc64le.xpak 56000112 BLAKE2B 6bd5cee529013d0dde2dc1c6dacc0c66937741b0f7b78ddb6b7e93357d5a9ebe14fc767ca5a6582680fa76a4b2c52a6d597035a585d70860b0917f67e5a0d9ed SHA512 5906461cdb1ed575a4fca48c0e1f4d0c62f3e9218159bc77049ed8f05a029af6e45828b118ed7fc484b241ad7c4b60a3ed563ae5e0008b5346e3443b157f9a60
+DIST gentoo-kernel-5.10.125-1.x86.xpak 57419299 BLAKE2B 318310ef584ec0ae1629743fa11963db5f8bd3855b8d583bc0f708288a0f72fc53c48266e96622f22b10cb5d42f7cdaec12a9a7afc3af327ccc82cea9e95afea SHA512 fa5b60bf0b642235b0e4f977cc6dc0ef7171e2fdaf238509656f25c6be94140f9a7188c3fbbef57723fff38f07a2cc9ae0b189eb32f57250474e68e0dd7b7167
 DIST gentoo-kernel-5.15.48-1.amd64.xpak 69354442 BLAKE2B a95c782168eac06b73cbb26d34778a7f72a837addf9947f868356af45d0fe91e54cc17d44d23db03e226a04e4f890914ad03c29615d250b603bb54f21a703ae6 SHA512 6515bbe9b6191e9cebc11a7bf45c6d87110e26a3d142b1c74a559a88821fa5b9cafc8e948fc32b6d8f8c7f4cb9c1d618a7d72d811cb2565e043e810a1c90d981
 DIST gentoo-kernel-5.15.48-1.arm64.xpak 64179857 BLAKE2B 776c33bf26548d64ef57a1e6519e03d7697fb3e36687c9d821f224398e87608ef6c19f03a45c5f73d2cffba03e7d5e698ba7b3bdf038a6a3da61d1253e81c946 SHA512 dfa64eebe6bc9ec9fe3dbda8903d4631c436ec6de5dcb549f320f439142f4b4e9a633b0be39ce3b5045bc9dbd44746e81fa9b60105d262c9d1f7aa6d09a959a9
 DIST gentoo-kernel-5.15.48-1.ppc64le.xpak 58119260 BLAKE2B b651299e4c429a2c56ddeb4e5997c696ff78ee5b5197be7e86446615204d9f7450b695f11002d9424d2f3284ba11ca4113122d035e2bb28bb030f57b9d04faec SHA512 fc3b787f4dffe4174a7f033204e4c93fe03992ae33a9091736bc6c15fd3d7e828b1f6e57889b9c1bbaf3f7304ed8153ad6868d74267157dfa9172de007417785

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.125.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.125.ebuild
new file mode 100644
index 000000000000..da84e07f808e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.125.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+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}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+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
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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
+}