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

[Michał Górny]

commit:     bf164dad898cc82b35f61d4d0486942b287d5cc4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 15:27:54 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 18:52:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf164dad

sys-kernel/vanilla-kernel: Bump to 5.10.42

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 98a9ea66dd0..e4a5a768343 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -26,6 +26,8 @@ DIST linux-5.10.40.tar.sign 991 BLAKE2B 
014af0182f92fd1e273d5d3ca0a8f98fe95cf926
 DIST linux-5.10.40.tar.xz 116350428 BLAKE2B 
f1df7204db26d588a93d09e1322e20f57b426a0e33a11bbb111e88805b43ebb865ebcf1c7a75362650bed372102706a48171521c62a07d1261e604c03b553d24
 SHA512 
1b55504b5ccef17c4392a6e78a6fa481a10c5778147450dd492aceac5ed8089ee76f7f650f4cacd9ceb03a5173f33dbfa0a0c975fc29ce7fff7a31a9f59e941f
 DIST linux-5.10.41.tar.sign 991 BLAKE2B 
5b4bfb33003683dee548649237d3941d2f62ff0d3d9b1bf45cfdec225b651c425915466fb0f4bff2e8f65f16818194e81cc2223bf315d957918d69ef51de0824
 SHA512 
7551bc199b8e25f762cd2c2fd0b46a61d7c06efff56338ada581f7dbab296d41b26be55abb82bc51e8c37452a2ba1d403ada7e18a74c735d9acb1aadf1fa682f
 DIST linux-5.10.41.tar.xz 116345168 BLAKE2B 
a8d7acea8a756a226788721c54cd9f9c13003bdaa76e76090a678045e108921c3feeec1660b66c87048380ff97f8050ccdbdf8d9d4878134dad250b0cd60cd0c
 SHA512 
67cc3b1ea1fee86a775d51dd94fa1c69c5006f500da575778ac4cf1c168014efcdaa75adae1524a5f6535410c0e5d25cedd44e172212b4da255ff68f5fcbf2b9
+DIST linux-5.10.42.tar.sign 991 BLAKE2B 
cbf7ee5fdea8e46c53bfe086d7600e4afa8e6ece6191a49f73223baaaadee1328097b06e6801cba6600b207f04d7ae3904f7c8485cac88a7cbc22f3ba0252a85
 SHA512 
985cdbc055ed79f39a7ffc5fce37252879ea8f9a29c4049bd006196504c667fb33e96437529350ee0e12f0a6fa792be69b4963a496c01f13259347a90ccc39ef
+DIST linux-5.10.42.tar.xz 116351444 BLAKE2B 
095722895f2570761ebb152fab4a0bf296e891c2f9270192f0e070e765af4d9c1d9297bb87dff00ea56d97035971f4e0adbce1b412b4f7484dbb5cee9e68fafd
 SHA512 
c55fadf0a2b3cf43ef65fdd58768fe13cc3e4d8cd6876897a6feca75c414c4e5ecaed61b96128c16ccdeb184ea0044dd36eb02bcb09c58d9a8ee88946d88c0be
 DIST linux-5.11.22.tar.sign 991 BLAKE2B 
fe9fc24695c42e7784b98da7555f3b70352763a2bffac2ad1488a371960d12e15ae2a559ecf11227dfc96c06c0b45dc46200b7f4be87717c3d55e7b2ad484a75
 SHA512 
6a18971c881fd314f04eaa32865f57e4b43513a5bb114e047e59eb5a19ae8e02acc13a306f701a29ab73c7e9a5b9e8af67626686f340179270732bb76f77e3a7
 DIST linux-5.11.22.tar.xz 117681288 BLAKE2B 
21e1a7c6400c6997ec0a66a4ccd7c3789ad99e9319e8f412a5e26f44b309ca6581077f84fd17ebf265089956ed2625acce12d6d6d9f246690c6acd6b21279840
 SHA512 
1f61c1d9e2ed3095110105b6f33565343e762c7e5e5f9406a3a5884b78ca8ff8e31bb5da2880b45b92ca3adb0539dd69597791de87a41369cf77e325abfae35c
 DIST linux-5.12.6.tar.sign 989 BLAKE2B 
b56b774cf47797224f97a93e4ae6708cc14773a42f4d5768f694fa102071118f6a66ffc5532c01906db1291cd67b0d316d1716eca727a3b7d2a3ca55fc637d00
 SHA512 
8e46afe9027d8c12b280afb061b26dcb95a297f57b5ab63cf752ab63a3d19452478192596b7687f40f2fcb7382de041cd7cf678810eeb0ce69ed6b338ed8cf8d

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