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

[Michał Górny]

commit:     9840e2389165b8fd2e015f596929794c0d6de3da
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 13:04:30 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 16:45:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9840e238

sys-kernel/vanilla-kernel: Bump to 5.10.70

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 3cbe113b86a..a61eb3f7882 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,6 +21,8 @@ DIST linux-5.10.68.tar.sign 991 BLAKE2B 
f418314ac525edb55b161244b27b62808af56360
 DIST linux-5.10.68.tar.xz 116420600 BLAKE2B 
826e796cef5be82ab54fbaefa14c104561429ce051cf2455d21da7f0a112d3ef1cd99a9ee287565792d46d4b0fcb880f3c3849779a9b04182cb897e37372b032
 SHA512 
9430f0b0e66513101ee4905eb8fb3cd14b7f64eb2847bd53704bfd99b1a608ec9c2ccb7de5e8bb2ce8a20d59654f94e38b62ee2212ed53461edd2fad137d2eeb
 DIST linux-5.10.69.tar.sign 991 BLAKE2B 
eba1042c07f142456affc9a7a52427a812d041180f0e7f6882559a55b93002d042988713a9f8fec1ab5d81e85818c3ee5745b5e52527febad97f20ce095deee7
 SHA512 
62529072a6edd6bcd6c87940389db0c0b31910d9266a90a0357a17b2e9ee0d9b2b9e4352e87dc109c7c865f389b5d7b164e146f0084959dfab6b6b66ad3c0697
 DIST linux-5.10.69.tar.xz 116436852 BLAKE2B 
09cad7df49f95459e08766d2a98d74007ee42a1e845f50259f88301a9e6368fc34decec3776d8d736cbd08ee73863c72b1b02bc345193d065c86d27e3922ebf7
 SHA512 
a86a6becdac8359b59647c01048d8cc21316e3bf113df85511e9890ca99b887b2def1e3bf0310bac54a986adeebfa9c76c6c4b9b805183d7e9ae10944fc051e4
+DIST linux-5.10.70.tar.sign 991 BLAKE2B 
2a7b6af50b66a8447156cbd191aab6b99d4cf2632c1de769eafc6eb111caa0ba4e571b78fdb7877eab390625181274a2e61492d0310d51911f646a86d1770854
 SHA512 
80574a393ef40439c41341a3ba46eff0422460e51485dab29c2250ff9fb3a8ee9a17a7960c957128df08dcdddea578d616c94d5d74166d96f45cd490fe1b1ab7
+DIST linux-5.10.70.tar.xz 116426828 BLAKE2B 
3bdb1890f1dca4bc20f1e3a5d9295bf3c9e598390ce71694049f7818526b8aaa173e2d24465d4e9da66a37254eccfe3bd34b3898a9f1c72ba372c196f956ca22
 SHA512 
db69bfd232d3d573d970fad673710232000fd52ae7abc60f73cea8beda88e9c3383c12a1e583aa798a4134b8646ab3cc8a251c16b0f6e7ba3301cdda9ca19d62
 DIST linux-5.13.19.tar.sign 991 BLAKE2B 
d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367
 SHA512 
a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 
6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6
 SHA512 
77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.7.tar.sign 989 BLAKE2B 
fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7
 SHA512 
4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.70.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.70.ebuild
new file mode 100644
index 00000000000..12c958a4bb2
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.70.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.32
+
+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/pahole )
+       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[@]}"
+}