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

[Michał Górny]

commit:     2e925314d74a8d07f70b1088789fa96b1b412e9c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 12:29:16 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 16:01:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e925314

sys-kernel/vanilla-kernel: Bump to 5.13.18

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index a920a5a784b..da4862c74dd 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,6 +41,8 @@ DIST linux-5.13.16.tar.sign 991 BLAKE2B 
22f97a73ccc51df80897997869b3469efa51fff3
 DIST linux-5.13.16.tar.xz 119349592 BLAKE2B 
1a914d90b2a2b1b2914212a3efc5e0532014a3bc5fdbde2abfdaed3cc058c3031d07ecd123f9a5218f3446268bce263a9c9257406d0edd37b2821ff00d366bbb
 SHA512 
ed4b11bf3c256a70f7114573a05cf63563ab352f9d9bb16fcdcb002ce857565e7251cfe82c3a05eef723270dc2b4d6577e5df80858506f6986c91c4ddd466204
 DIST linux-5.13.17.tar.sign 991 BLAKE2B 
3421173d4c398142d6df39203245546c20b9d443dbdf6cd992f7f92bad5c5e5b8c65be8c71ef987b4f553bef46c5e70673ffdf78672be687d88d88644c17e13a
 SHA512 
8c631404f51020887326e694ff989d536e8a07b6fbfb7bc28c9d7286f3b5d2650b9452ba82efcbc5eba818620c2d8d5e214d02caeb6e065f20669027f3f4e701
 DIST linux-5.13.17.tar.xz 119356516 BLAKE2B 
715f5b2d3f784ced0b74357874b9af20e7298012b98393db63fd00937b854a4764832cb3d9a7b0397516fe6ac2157ef9d318419e35a86ae877734f34961a05d1
 SHA512 
1de6c0fe3d06e414b1f9bb29f37f37280412bc7b1eb9fdb173af9ff997eb72c3e49219c5974cea5c7afbe2ca47f380a2213e7281d0d01a76a8bc4df0cf1049f9
+DIST linux-5.13.18.tar.sign 991 BLAKE2B 
c5c2a28fa6d2fce7e2de300ea21e20e371002e6c97a13504991e42274abdddb5da05ad9de5fec5f83afa71339b4eead447def449b050accfbe12e507eee85523
 SHA512 
7bd2b61ab17b8f06cddfdfe27e42342df387a990b4d8d8bc04fbbb505efda413913a1f6f02147e40d19e73efb3afc3298187aaebd4919de7fd18f69233720361
+DIST linux-5.13.18.tar.xz 119350900 BLAKE2B 
bd230284e71999c676faf1ee06cda910d5bfa427cf3dbc1d1e08eab21e460e6da1552a7ce7865da0deb0ef7a103c6143f0201176f3cc2d5381132d907819e3c6
 SHA512 
ed145f47ce64b6434c32b910f8fb3e02a13922c8c2bd83ff6b4d51a3bc8d4a6fb7d032ff5c1f7e542aaf2f4cb12084cc2b9e480c881911430d914488109c315f
 DIST linux-5.4.142.tar.sign 991 BLAKE2B 
2d441365323df4e0ed023917a5d9eeff671e29d1afef32813d6ff4cf554a191237e27acc1c1192817007a262bc8e5d8f42d7aa14ff0add7cdbd656fb20cecdcb
 SHA512 
728a40e0cee11d6300ee3b1f13b329496de0d5e31872dc8335169396b077678c8bde4361c5fbdad3e54f8761dca507cea71bf8cbf5ea675c9c8d7b055c073e2c
 DIST linux-5.4.142.tar.xz 109145144 BLAKE2B 
680d4a81fb20005d39dd6d1b512b0e744cc7d6fcdb45e6d67c166d7ca7dff83acd49cb14fa4a38369d77bc91cac0b36190a5b1f042495c40fee9b5e7ecfb2dd2
 SHA512 
fb9b9f345bb1d46e48adbaac7b12ace50f279451793ac3671b007447d3e38a59d9b9ecbc55866fa2a6850babfcd1ef7528234f2ad73e68845a858b3b7a1d573c
 DIST linux-5.4.143.tar.sign 991 BLAKE2B 
4d2d5f6cd7c78234e074d59a004b1a96f86746a9b692d7acfa8afe6ce5bd40a02c86c7e53d2749c71956b7a5862bb0d4f46b79b1a6211e93028b53728db4b477
 SHA512 
f8fde6c2b06c3a7ab9b375f90177e1809460514a95bb78c1533bc55df00b80e09c87145b67d5ea336dc3d25fb9406d7b6818695de1ce0ed1ead60fd3df3173a5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.18.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.18.ebuild
new file mode 100644
index 00000000000..c39db41a95b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.18.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.9
+CONFIG_HASH=eb52b35e8cb097413357b578903bd18eb76051c0
+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[@]}"
+}