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

[Michał Górny]

commit:     a87b22be61581cf135ce1d5acfa60ccb14983533
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 12:58:30 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 17:04:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87b22be

sys-kernel/vanilla-kernel: Bump to 5.10.58

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 15ef4665a29..c4653262c2f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-5.10.56.tar.sign 991 BLAKE2B 
acb71b35826aeef78a977306ff3d4c8db81d5d48
 DIST linux-5.10.56.tar.xz 116391116 BLAKE2B 
026ed9e08e0dfba2551e249880c2ab0490d2aadb068997cfba6e1a5b7b610567db9f76c3cd8d6bcba3c18511c70037812e305f3ed6503a101776b653dd284d3a
 SHA512 
61438e9354074b47e0aa834ab277e9947c8b7353761e0ee9dfe2f2e4ecd3e8c406e7efbe4db5cc3d8e234e95a52a83f6009b7f0ae7710dc33c9afd9e78471e9e
 DIST linux-5.10.57.tar.sign 991 BLAKE2B 
69039a9391342df15291dc5bf0008cd6f1e86c3f02332d5fe0ab316c8da936387f57604a168ce8177cbff8b5e57d9cfef02eaf461bf10f2ffab326e0e1555a78
 SHA512 
9cd0570943a33a55094c7b832d793a936c1fb23b930db151b528eb3ca55e98adf3fb7ae9d0bb16efda8ab482ba0b71e0bc472136b0ba98c71dda9cd40392e93c
 DIST linux-5.10.57.tar.xz 116393956 BLAKE2B 
b385c84e2600222b90e80fd4bc42ef3a1618d8d9c0ec337d65187d17a7fc46b9623345eeebf955efe78ffa641254dd257d6739fa5fb7605d1990a7ea602f3a0a
 SHA512 
4d2719550bc3e89b5fe8c511ca78f509e5225f04766e28f24c29e761c8b2ebb29388ed9112fc6e35c3b351cc0faa11ecdddae8f184e20d79f93fb0924c3c4b2a
+DIST linux-5.10.58.tar.sign 991 BLAKE2B 
6e889e93effad7de610106ea1806b9a77541ef79a475e17d938aafccbacd4482096d89408f5e3f8a029f446d0b7f0a7f1aa23ebb736f714117d5a369ecd98801
 SHA512 
b8865e11240fb54c8c47406931b9ef87ff69783ca7e73a70b0b1402ea34a23d83b370e1d7ff267100f3d12a1c04b2b220446001804eafac403f38d770104df17
+DIST linux-5.10.58.tar.xz 116398504 BLAKE2B 
a93f38692f7b6103ff60a3d5b779f05b27081c5aacda47a86776680e3cc35c78848e923081cb23e3ddca5aa0fc141997ec6334c5bac4b2d6998ee79dc457fae2
 SHA512 
cbe5a7e9da6c9ce32f76cac0b10456546c69392d14f77f8158f92651c9e0c0d5463df48df07ffa10532ece209f1b8697e83db1965dc4d372a913ee9aadde8681
 DIST linux-5.12.19.tar.sign 991 BLAKE2B 
881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f
 SHA512 
fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 
88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6
 SHA512 
2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
 DIST linux-5.13.10.tar.sign 991 BLAKE2B 
a3742cec9a3e12592597b109abcf0d2444864823012bbca69a42a8873f93538de021625b5edd9a9f1282d104b3641a68e2ba95606ccb2ed3f7170a74e754d537
 SHA512 
c9a8813ce016ccee8f03f64aad59156e44ab1332668fac58fbb7cf5947373dcc5b54d7ec0fc50f5e2d90f07482e3ce609cfdb8c1f3dd9a255a36fc617ee8e0e5

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