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

[Michał Górny]

commit:     0d0cea41d20013f572dfd4ff37d299eae114234d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 15:52:08 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 18:13:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0cea41

sys-kernel/vanilla-kernel: Bump to 5.13.6

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 90364be7b3d..c3366e3f7f2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -27,6 +27,8 @@ DIST linux-5.13.4.tar.sign 989 BLAKE2B 
06c680880006ddca64c4b22e8d853e1b72727a3ca
 DIST linux-5.13.4.tar.xz 119332428 BLAKE2B 
325a64af66d0e4390e32c83e60b279745c66cff6f0bf1b0287b1456d7cf5e85444b7f90d19fd08924e3ea652f8743582d21377fa24a794b4b5cd099b68b76ce7
 SHA512 
dcd44f0da2420093f6ed8e44df4ed81fb8123fbc25d2dcdddd633feb3fc455ec74ef7a683a9c249e7089981393fcbed10c41aad10d4b0108c964cbd485e359e5
 DIST linux-5.13.5.tar.sign 989 BLAKE2B 
105ae9b51f0723d074f312dd35e8d8bda13d5f76fcf428e7be953824132bd6a1f4b596f8c0f0fe7307153222396e0373fb401e2355d49934b2d98234b32a16de
 SHA512 
614ce1d057baaf48d80db51a24215f17f0709a6d6840b0de13dce63a2b4c2ee6f711031e291951e9ca13e49fdb11c70e2dc33fd863f4c015b95710f8fe7259a1
 DIST linux-5.13.5.tar.xz 119328832 BLAKE2B 
2795e57c54c8e1bfcf959c1468082bee603832157f10233ae5e57aa3e2a6998421ab14f33998869810b68227dd4e0c0791fea0fa5fab0c132f622c1ec5d79c73
 SHA512 
887a907f5923630224d2bbadd1e60e49856460ee5fde9fd6de770d908bada5c6fe1669f9ed64418695e9101a8e5069854beb23714dc8138cdf9ea7e319b10743
+DIST linux-5.13.6.tar.sign 989 BLAKE2B 
c559917c2901e237de4e7fb2dbc66b4af9bfa0ab48c48d262dd112191b39a491d9c3ead62cbfde67e4df75c070aaab02946ee319ddd6a9f66b25a3f69803406c
 SHA512 
4cb18ae58d8aec9b350465699ff83fbaaba0e1d32be4664eb7ce4f2aceb45efada59cc98e04584ca81758babfe808d6eac1653c2b80ee2a637f08a675a0b7085
+DIST linux-5.13.6.tar.xz 119331048 BLAKE2B 
2ef4e2a144714a188c67bb8262cacff7d81d6eede02f1289c102312570b41dbf51653e7862dc18cff120bdffbc8dd0763018814c3c0279317d7ba8b0b3169cf6
 SHA512 
3c03d1a8232258e23e6cf3a6f441299ab3ccb422c6d372d4b73ab447c963f3f7add9db9a435f2e63f404b665a8005c7233509090d0c0bac5c06b7387b99c2453
 DIST linux-5.4.134.tar.sign 991 BLAKE2B 
d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7
 SHA512 
cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
 DIST linux-5.4.134.tar.xz 109136880 BLAKE2B 
c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659
 SHA512 
7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
 DIST linux-5.4.135.tar.sign 991 BLAKE2B 
0d64c3b0390b34a42ef4cd60df2f6e5c0ef2eff8e492ece562f301800bd2606042370bab40f5a9edac29a905edf74e9ab5a487ba2dd33a2a84704bd4978939c0
 SHA512 
95d2689a9297c2214f42b9e94f644e117958baa4bfcd9a2d47b4c80fabe56d1475522dd07471dd35efd72baa4d40a4afdb573c1b06f9e8957bbca2a805c9920b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.ebuild
new file mode 100644
index 00000000000..7feaac0c449
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.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.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+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[@]}"
+}