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

[Michał Górny]

commit:     0f7ae84ee401e23ae4b49ac41a72e89e4eabfc62
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 19:26:00 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 22:46:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7ae84e

sys-kernel/vanilla-kernel: Bump to 5.10.31

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.31.ebuild   | 102 +++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 360b622490c..1abc3c9658f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -18,6 +18,8 @@ DIST linux-5.10.29.tar.sign 991 BLAKE2B 
96075030f4c6daff356ea09845b80d50785d0b9f
 DIST linux-5.10.29.tar.xz 116306596 BLAKE2B 
c27637b39b12157cca4b9823bdb24f979f4f89e7a83f4bda6fffe3a25fe70ee82cb731d549b4ab682c6736fd40bef4f5f8e3ef0fed51a63f77a83c4150736859
 SHA512 
cb0f11b2b3ef0a98d73cbf386199d195d055ee9ac402f8fed7c2c7a09a932c938de63bf28a28a6bef8917a9974d35e7dc4118a408a50341196d1dc3617cc8498
 DIST linux-5.10.30.tar.sign 991 BLAKE2B 
7bf651faf08ab2bb3b07670e32c0c6eb1cc09bedadaabab4f391495841ab372f119827fbe51ce7e6bc7047686748f9eb62b0bddbc7040fb9763308bf1f64998a
 SHA512 
4507166c972cfbf484d90b49a1156f28eb67a8d5cab8d1ad602b02e1fad0b3a55339d87685b65504df98ad811828d335836dabb06f8873f39bd4ed7b222921e3
 DIST linux-5.10.30.tar.xz 116320464 BLAKE2B 
688217cd054aed2d7e3860cb6279c278e1cf052a05257948ccf9e3b5899bfb43b1418130d3fb0f6a9efe2eb4956f795a36f1173487d4432c2451196d47b2a76f
 SHA512 
965b5181a15c05e1365e4ed90b31492ac40c3e92384a27e3540175810bcbca7e32e3bdeb59786716d276f97576980ef8b0663a8b5bd3e6794b2df30878c6bf20
+DIST linux-5.10.31.tar.sign 991 BLAKE2B 
9d5d059f3b9803f46ebe37bfe417f73a108969281fded8cfee73050c613b81413b057578f507f2948c65a20e3b0dcf512a108a89721b9a3bab07a546ef152058
 SHA512 
a4f0120b91d1823091e8e7ecc3145cc202900511b54f215573a963050f10836fc67d90427df78679c07be6c909eec7e79bad5940cfe29364d50efd840ce17ecf
+DIST linux-5.10.31.tar.xz 116317044 BLAKE2B 
1b54ff36789dbe52894ed6bf4b4ecc323d6758a0065aae2923231edc3507253f8be8737a497b11d77ace4bc9354ea2e9de987d1d8c7e873784c9ab66a85e797b
 SHA512 
3292de96d36dc5b17fea69e348bd5379554aae10806745348ebb2d846501059b4a9d63450f714913f7d44b977794d810f7f5f3653d579683963740105ab45297
 DIST linux-5.11.13.tar.sign 991 BLAKE2B 
32a8fbb32f1c1b6480377c76c157a78436399b7cbdc153650057780e92f8bb5cbbc0c352a2ed9fe8f61c481be874df9e30e96c2fbd2eb9040a4d979eca5d0e8f
 SHA512 
d0e4df56efed1ca900b206f25b6639fcc502c9a5ace9d7f40dfcd2144e066853b8168774d430717511a78c54faf5f3d9ea58db1f37c89efa13ac193dc22c8e02
 DIST linux-5.11.13.tar.xz 117652480 BLAKE2B 
fd9537a0eb265660ed25d12ff4098ca208035576c580f81cb6a1355eedde2748bdb65521641f68e626a1aee49e7494c79627015a376b7ee4a6373622605ac760
 SHA512 
6502370280f3bb9d6d91a7aab1249406fbb1f9897eb62baf8bd72bb5845b0ad95931f94aa72de275fb05a36ce1f0d7931fdf53de93a507043f260116185643af
 DIST linux-5.11.14.tar.sign 991 BLAKE2B 
b1a33b95e3745ff9bf361614daab255cdc90ebc51c243d4d5101ed24e911b3be357dc12d4d6aa453a957cbd0a9cfdfb1d1e76d264806b9ea4c836a84fad96bfb
 SHA512 
d21bd52c50453d63ff68b8c79373620ad6d29b4becc09bc16b3898eec70b24084cd5d718110f78226b1eac9fae31b6885667da452741b8f30634e13ef4201fe1

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.31.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.31.ebuild
new file mode 100644
index 00000000000..fafae29a72c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.31.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# 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 from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       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/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )
+       verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       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="-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[@]}"
+}