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

[Michał Górny]

commit:     4a0cfda4212a508f9f7d3a6ccbe2ab425508bb17
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 22:45:58 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 22:46:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0cfda4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   4 +
 .../gentoo-kernel-bin-5.10.31.ebuild               | 117 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e4daab97499..090069e7524 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-32.base.tar.xz 1038952 BLAKE2B 0414cd3c9ebb99fda1eb70204a83
 DIST genpatches-5.10-32.extras.tar.xz 1768 BLAKE2B 3177bae554ac8e5ff49ef98fb594ebab849be1e2b639e22bc4412140f12cbe93177553a0ed404c176891a67314db3c468852237ad7f7b7fbaf8039263a51f483 SHA512 f13419f37e72f3eefdf2d3c18ae68060c45a5f561dc4e493e331566bf718d40cb89f1a30f88d6563c8d834b781d256977a383befc0b0b397008421010aad6ad7
 DIST genpatches-5.10-33.base.tar.xz 1088684 BLAKE2B a3d76185ce3e0cd6bc769ce500ddf041fd5b554ee4995b05f823e67adccbf94a6245e25c06df2a3440acad7f4fe577b62048f6e431c71defcb21e1a9ec9affc6 SHA512 119d69d2bee6944ac90bf882faf48402e311a084d43e6f89c6ec8bd43ae3701994f7dbb44170eb6f2d22b30a3c8560ae117892dee478d10818314c0f1ce82e5d
 DIST genpatches-5.10-33.extras.tar.xz 1772 BLAKE2B 92bf4a1dc1551b703096c0a54cbaa0dbf0ac1c012efebddb78671231e850b7e05162c48af81eee114b68495338562b04a67486fc9cf142ee82465489c332707a SHA512 f369685fdd2ca7a1d9385d8e304c1d1e9dffdeefa22b8ff0cd01bb4a258ba57b132e93caab59c72829419f0cb92fae9b06e0f6af638e87d8935a9e0a3ea6c2e4
+DIST genpatches-5.10-34.base.tar.xz 1094372 BLAKE2B fc02d1344658a518e588c8289471613c068111fc213f96b73ce6468a83bb9bda1a9244ed11413a3dbb672023d70818188905fe1edf4a4f4f76a3503997f62ac8 SHA512 af49844b9fde66740e439fa9f415e5f0a273a971c1405ce9b68e638710ea2068d28a052f7d9027e6f0fe9316c22a18015563eae7a30abd0463c8033c5561e209
+DIST genpatches-5.10-34.extras.tar.xz 1772 BLAKE2B ed8c15560842e9de484ee8a6796723f3e5ab9c2d4882b318f1d2ef2e8c273b8af1687aefc3bc2e4e502fa81bb3c662181c6dca5cf1ba3e9350bbbe3a5709957a SHA512 4abf0269143ed8137dfcbf01fc18a2e033c7ac2d241834f4ef830c9c04e4aa6e94ea8c2509971893b41fb31da17c715cf58975b5c57682005a29632623499d4e
 DIST genpatches-5.11-16.base.tar.xz 567216 BLAKE2B cee97030c5e59b9d7eea622bd4b8d99f8ec86cfb5e559abcee5184d0fc9acecc5f3b048f0c8f8949f5ea52169ad60e182c2239778d4cf758f41daa1cd593fd71 SHA512 f3d320de79222c26d5fc16030752fce85d3b4cd2c9a769da59aec64f410c1a63f76d7c4c429932a046a4611a12fab2c2f259f7ba4821b7381d1e0a7a2c2df9d4
 DIST genpatches-5.11-16.extras.tar.xz 1768 BLAKE2B 12e78dfc00d3ce8e0b9903f62a6c4b1219e4559a9e6e736d5e4f807a429d91531d39e69f46667297f65824a074af4cf7665e741086efafff83bac195fe649455 SHA512 091b3f9f3589a098c35c3172f1192c56b774f6fcf90c30230a4a6de237db14895f13a75e51324acf83c5b5d8af14f636034eb3bbb33b6070804adf62ab7ad194
 DIST genpatches-5.11-17.base.tar.xz 626484 BLAKE2B 4b6d07334c1da48619d820b102df5bfc2d15113d97415e9ad789e8484a39a66509cc360019368834c525a66af0b577b165c5bb898756a60372f1bb21802ee8b6 SHA512 36ca2dcdccd03be5f3c3a350c4f721d5f00adda12c87ba08146b13fd034644ed82eb9e3151ed6210fcc16a37a7ae10d4353be5477a320110e8d89fff74218ec4
@@ -24,6 +26,8 @@ DIST gentoo-kernel-5.10.29-1.arm64.xpak 59322979 BLAKE2B 4fafbbaa1a68759e6160af9
 DIST gentoo-kernel-5.10.29-1.x86.xpak 57248683 BLAKE2B 4b803e88b396e16b80dad57bd50fd2b4ff952a5a353992f9da69001a6356a6bf4d5e32d4a2d469338d1f9694c42b2b8fc3191a85a9e61c3d3e85e138b79e37f7 SHA512 29cfd3db63221efdf962a4387a8d27f61ce4980d582462d6238c84fea751c2196537d0bfc763daed889a89067f0b0db8b6014e343c3b2d18ac8363a29b36078b
 DIST gentoo-kernel-5.10.30-1.amd64.xpak 64347202 BLAKE2B 85a0fc2d2df1d1a134738e4712c3e1477062199ddb56437507a7ecfc0bbacdfff5e6794b4e547da3494b28016db95616166f75fc8dd3c29aea21dce464658da7 SHA512 d246c134815a02ca95be0c063f170a220bdcdc023797b0dd6a61c17e0336eab194a0c50ea8580bd71e3fd1ec2fa8b7fde97d4eebbfa886052b1bff2d7ecefb04
 DIST gentoo-kernel-5.10.30-1.x86.xpak 57245779 BLAKE2B 22b2dcaecb0fe062e1ecf61aee6fcb7c27d23ebd2d858bdd4933453724c50af23197635827a262e5cd8f6ad045919a3670d51c5c3ac63e6096d109ff4c44b99b SHA512 3a0e669b9c7b1f7e8207c8f8429beaafb0a440b4680206efa2ccfbebe3717e1c1b6e7151ebdad32a4c6cb9d6cbcfc43cb271b47aea7f27790dbb92f3f38cc137
+DIST gentoo-kernel-5.10.31-1.amd64.xpak 64337577 BLAKE2B 231e6cb5bc36bbf01f41295d6969b4ef5029fcdcdcf0fac6565dad7bd5ccf1601088d5ba1fdb0a66b58badea14090f859d5df6fe59290a2cb08d88abf12fdcdf SHA512 1ecd188b65567929dadf079fc6953aa2541d4ab856d5d802cd9c988365f21c0eebe5303f44d3e89f247878258a2e91fe561c5f7d000cd0bc9c4344828fc753d9
+DIST gentoo-kernel-5.10.31-1.x86.xpak 57256746 BLAKE2B 5c9c42e714f9b896ae2f01f602bb9409cfa210b6a75195de6ddc4213411f6e4ce86f2fd7279906360f4e33c517e1697412f7df8f3889c4e4498fe378430eba6a SHA512 04a18daa394cb2ac0cb4eddcfdad525a7d73861978e6212f152707207548561101fa0294461e43a9aeffe8f7533aebde7a13f26b46e6bd191e72a996d704bf5b
 DIST gentoo-kernel-5.11.13-1.amd64.xpak 64685029 BLAKE2B 7d6794c5fd15434d2ad93d36678476e4a6aa3ad9ff77140a0bc8d74b0c87155898e8f1f76dfd40f72c878d9ddca7b7f1a9f0d4be2a600c5e2c18a77a3439e9d5 SHA512 d8c0fb975ee35e6d71b3b255800179805c9e70bfa7ef5299a38145c6cfd4f60720281c70f2d16a409a10c4ee6c6f26ac2e0c3151b114ced91c747371b59885b0
 DIST gentoo-kernel-5.11.13-1.arm64.xpak 59816443 BLAKE2B f3bd4b929cd103f95b91f0c0f28f324f8e316e1cc4b310742d159b8dbdb6c288d9424984e0859873924ac7eb34f12278b2086ad48fbf11da955f0b390dfda619 SHA512 6aae6cd29857eb897a167e359f9628692803bb75a0a1f235468a1b95e9c2f3d9525f33d6673b5c12edb5d9feba29210a79d8030d151a5b7260119a81eef57e1d
 DIST gentoo-kernel-5.11.13-1.x86.xpak 57618749 BLAKE2B d7e3d71d8eb7c35b4f86bb95cdf945f4fa7eadd0b87e380ef37f3b63385a15566246e91f12bffc0a7e3e42285f702cd99387fd9b7e11cb59fe3bc2a9da83f160 SHA512 51450b58469fdd8b663ee7b997b392232c658281fd243c2508f8feb190a74f5ab952b1041e64a9b4204cc1e08fe328f06262ca46966e16a0f0c962b389254fc1

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.31.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.31.ebuild
new file mode 100644
index 00000000000..6208453ad7c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.31.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 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##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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
+	)
+	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 ~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
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.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
+
+	# 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
+}