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

[Michał Górny]

commit:     b1c38bfd74a349f9586e3c051c6c05b5981f739f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 14:02:59 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 12 18:21:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c38bfd

sys-kernel/gentoo-kernel: Bump to 5.10.36

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 72a827f3b88..580ae2930d7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.10-37.base.tar.xz 1128824 BLAKE2B 
a8ebcd3b109cf553f145ee564332
 DIST genpatches-5.10-37.extras.tar.xz 1772 BLAKE2B 
5113e357d91826a6927de7bb4cc655055ac872bfb221abdf6d1c81f1275557c4204e655ebfb992b6c976183d2e5112e96850aa5ee10e3c2d2d4612223ad14f56
 SHA512 
7287b929dadeff3624e94543a03c0f83b6c3af0ef87161a02b8d98f5d804f261438224ecb923783c613a9d408ae0196e0ec7499b233da6aff9d46e523721b45d
 DIST genpatches-5.10-38.base.tar.xz 1136868 BLAKE2B 
ef49a1c931f52d3edc2c3a02143c793db88e03e0e700792ff4f42d66d1394e6fd130df5accffb7b1447a16358c084888269d7b7e33068088674e87b04cc6dd62
 SHA512 
1eebc9b26e7e17b104e8c0d117867d411073a4d78aacca7ded3660deb2a78ef9ac4046bd8f83957ea811173e09834e7050342ff479c8e7363da3c807d1836a1a
 DIST genpatches-5.10-38.extras.tar.xz 1772 BLAKE2B 
45c74393cea275509e93d37d13f9cb85a5863e6bd810fea2ed9e00f7056bdf5070c801cdbf7594e461a1f8a2e2a5f6c9451b9110c1dce296829164b9f4f1914c
 SHA512 
d2fee843714eca319a7653ccad316df0488abaa3b48b27247a5b8c71057166a30b1e08a78f3f87db3603dd079a081eca4a049b835adc9ee6a231d2b97307c763
+DIST genpatches-5.10-39.base.tar.xz 1213832 BLAKE2B 
8fdae4f5c9665c8ec3f7fa4f202da702a76fb7cfdc2b73166577e8cf023e06bc79afa583c31b09ad5841b8e4f197971349be44fd26ed26e74d928bd7f4d06a7d
 SHA512 
93235ea58cbbdf84b9c606c74c3aad1fc4844dab6a55861034069c286bfaeffbd44513d13d8802182428dcf74729b039e64bdfcfa6786aef54992c8e439a83c0
+DIST genpatches-5.10-39.extras.tar.xz 1772 BLAKE2B 
2551e576e899dfb659a5b0ef1851697462ffb9625882ee6d737abe1c41d0738ae25e94146bbd09de0f6d98b0f7754d0dc72d30367f94ab38d88bccbe60430b23
 SHA512 
c03e8ca3735c53af9fa84ff0148a02af5ff578a83198482bda8f2a67cf4ff501916a2dbf89b7d7bbfd3aa97b748eca56bf42e18c7394b980b52dd24f10875bdd
 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.36.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.36.ebuild
new file mode 100644
index 00000000000..1ff510899e1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.36.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.32
+
+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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/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[@]}"
+}