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

[Michał Górny]

commit:     4734b9e668d96eada85a1c6b6c84379c75a61e56
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 15:17:20 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 19 18:21:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4734b9e6

sys-kernel/vanilla-kernel: Bump to 5.11.22

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index edbed0004a1..5782bc835ba 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-5.11.20.tar.sign 991 BLAKE2B 
e6dafa9f4cdd4614314dbc51772fbf203714417e
 DIST linux-5.11.20.tar.xz 117658868 BLAKE2B 
0e2a11596f33558aca0fa91079f12eb9a20e83f7a7a502b50a5cd181d0ebf9fa6a4f511f87f5f1f3f1e6bc431eafc248a86aeb0b626d4684845d9d3be023cfbf
 SHA512 
45932b41e11040e704a3c1fd1144fb8eeb5dae3832dda2b2fa133135b560d30385e13b65c9ea368273c68d9b61f0bc0d70f521edcc27fd14b23b18eeecfc0713
 DIST linux-5.11.21.tar.sign 991 BLAKE2B 
54ff6e44bdae64c0334e3efd7e7d0a7de8731a43498c58c4832008d00f14ab2223be130ba8596aaa610283789db513c10277901b62ec05fc35febd85a87d087c
 SHA512 
90b6571b2be1afa0ed736e781c1574455d685f12bf2de9d9f7e2ea44a2acf41ad9191138903195bcdcfa9ba0bb4d09e9d13ef621265133dfa9c636550f1baa6d
 DIST linux-5.11.21.tar.xz 117675368 BLAKE2B 
f00e62dfa28baa610c856103cbdff17f70accd46bc9d59996e6e38b0ac7af86243e67333aae4e6de2c65dd2d6709713ee00b60238e6d41c6c43e6b43bbe0c4a0
 SHA512 
69a9c0bb1fe922aa755f52b8cf48bf64be62419e3b021295cd16a4aeaca2f18726ce1635cd79bcaa0312200fa6d0b41ebd3db28e5dc1e02d0bf29ac000136122
+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.4.115.tar.sign 991 BLAKE2B 
ca965dda28839e3ac3f6a582137257402de9ef3fb825d811c3c86b9d52660bc5e056a7b3bfdc5353b6d24574c9c54ae46e688bf520199349ffeb527ce7246c7b
 SHA512 
b691a972909827c0a97cf8e901e2a36adebac280c0a32f1bac57107ed5d5f1b1b20ee2a5ca08136fd077b9c80d3f72d5084c0623a88362cb1e21f2f72a26c695
 DIST linux-5.4.115.tar.xz 109094472 BLAKE2B 
c4a8047d8297eae22e0e581f70caba430cc93cdf92a81e0cce12a787248c8d1687bbbb35c3f41808609f6b3f78d491277d9f7daf1910235439b95cd48c5c9233
 SHA512 
3e2dcdeadb8fb1e67116f04b00c3716686d12a99ee3e48ea3ac9fb1263a36b7b1c01aa837cf0a8409f21392b44abf64e92ed264091b3f5205b75c3b67bb30ffe
 DIST linux-5.4.117.tar.sign 991 BLAKE2B 
01a030b5f92245c0c439ae3c4af3e0e9a8b49b055407ba1c488f3df9e1801b6a3bd153a9323bf8801d9296f9bda25255aca50b3768f468e6402f16d5953d1f9d
 SHA512 
093c0e8502dbd3228139d82334fca5df0d408488117b2e94d2afaa02a44aa426a0032300469d73784c7cc6cd2d027e3f8cb3c7c274486907ed04b83ca75914a7

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.22.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.22.ebuild
new file mode 100644
index 00000000000..47f5c96dee1
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.22.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.11.21
+CONFIG_HASH=8b43a43382cabcf6d64266565ccc052c6e5d58a6
+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/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[@]}"
+}