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

[Michał Górny]

commit:     8b7135ffbb175b398c6d01f4c361217372ccb486
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 19:26:11 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 22:46:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7135ff

sys-kernel/gentoo-kernel: Bump to 5.10.31

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.10.31.ebuild     | 90 ++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 387331f4caa..c8bfaef5b1b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/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

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.31.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.31.ebuild
new file mode 100644
index 00000000000..27047d61269
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.31.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+DESCRIPTION="Linux kernel built 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       amd64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+       local merge_configs=(
+               "${T}"/version.config
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       kernel-build_merge_configs "${merge_configs[@]}"
+}