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

[Michał Górny]

commit:     21e5605ea0f4632ee5c6d68ad524f8f8a22b4e34
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 17:06:55 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:16:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e5605e

sys-kernel/vanilla-kernel: Bump to 5.12.13

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 4fb999e3ea9..6ec179754e7 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.12.11.tar.sign 991 BLAKE2B 
4b01328a96e7dd0ac1487ed4d8d3f5369af6ec2a
 DIST linux-5.12.11.tar.xz 118156204 BLAKE2B 
b5955fc1dc1ae416ef90c44d871f109d6a9130e5fc8b60f73cf98e14f4ce48b0030c79053d88c335c43ac6ab6f5786f9f054577f76c30f5505ed2d70e62d9aa0
 SHA512 
2001467f50c0bdeb59469f61b20e446a9719be934df0ddc17d6e8f9cd0a00c64e9aae01d216475c9423311dc38080b02cc2e5b93d7b3522e9c36a531b175ef9f
 DIST linux-5.12.12.tar.sign 991 BLAKE2B 
3cdb4aa22a5c4957c7ca6bd5e5f6e7ec7bbb124586a338b857d421397d2a5210968ed175ead994d201b339503e5499be6eb3f277e2c2af02a194e0dc5c8672a5
 SHA512 
a550e600649885a533b2f86f6f3812b240c09d316ed363fdd016bcd7429e5a0438fa03b024d2399e3e9008d00e44ce9b9643d3e78fddcda2b5b026f51474da65
 DIST linux-5.12.12.tar.xz 118165564 BLAKE2B 
f9aef3da2f65916cc30da9a066217d3379036e6a32a732224da7fee86c80810315484f48132b50b8cf8eb5e0b055ad1b7bbe63dadd0eb54b0b0626bc57c20963
 SHA512 
2804753d92afa66888f38260fb04dca4256be3a35217529f969aa387e4b23bf0442c5b929bfdcc0eb82e173e6ae632256d7f23179348cf2cb7796622322f22e0
+DIST linux-5.12.13.tar.sign 991 BLAKE2B 
c6a2a416bcfebdc1661f7674643e0f8107d4ce0d35962ad12a21004b7070cac86e517d2b067cb9aabed47051bb3f8aa32d0f2c98bbb0c12a6d1f89ee2ce8577a
 SHA512 
984f031a8cdc3161dcf8e7a6d48e07aec9bb7e9148c8fb36cc23aa219d5f74ddff844771ba7f4a335fef3399e88f84bc61dcdc7a68b6d5eef86ce5a3463b1cb2
+DIST linux-5.12.13.tar.xz 118162216 BLAKE2B 
3a959a1779a8c19f59346e4b5cb6f9af84fdca993b248b2ea7c9fac6cd4c1f73d7a268a0f287143bdd4924711cf54223669a4e706327a40776ad0b9683b505de
 SHA512 
e6a2487c09898f29164a22f23209f2a2ef2e3dfea263e659e007208289c518f5cc16c8316c2db49195362dcba61ffdfe64a3c57c254acfcd9e82dc19f6808be5
 DIST linux-5.4.120.tar.sign 991 BLAKE2B 
12c786791b72afccc4a3f9c412b900f25355920c3b253160bc9da0193983dfaaf4ed81886e5ffc252b07b34dec6d6daa59625bf46b1ebd6a7aca8522235923f6
 SHA512 
67b32fb8cfcd125ee66201d76eec364d7d8839a3055d43eac88eb812201969d0ed9d94d8c57e9be8b35f0a8972475381c6d41e480c7c6086cf351d4388f80c04
 DIST linux-5.4.120.tar.xz 109107108 BLAKE2B 
d3ccfefaadfe4186cce3232dc0b58759914d0f9eb0ac7c82b855d0230a512b92e37801b75e32dde57ef5d6d6ee04c3bbd59f58a20e73304cf235c90c7dd2855b
 SHA512 
b376e262164d8a79a4ffe478e42e38929fcc4b7f08dfaed24a842c238d55162ebcc1f6a5d0926a618e03f98f7f9623997306ffa66c6425f3e77865c2d70e1d54
 DIST linux-5.4.125.tar.sign 991 BLAKE2B 
3745764832f01f1d0247bf1ff6a4ea9e719d1a2881a563ab2bf665d1b0a9646ee831fe93f456df09cf7843a4c6310705b5ccc908ec927370992828a44327bc04
 SHA512 
d15ef5591e875300e1e6e6d0b9b809f2f022cd6064f1313c2b77b1a07c79a49a857657730eee0d0599933ee2e6940ffec2556220955c6a4bcddf5172ca1325f5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.ebuild
new file mode 100644
index 00000000000..32d99a8f85d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.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.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+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[@]}"
+}