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

[Michał Górny]

commit:     035ca6624a76533783cc6bbd4f5b05b947c03a97
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 16:31:54 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 20:29:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035ca662

sys-kernel/gentoo-kernel: Bump to 5.10.64

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.64.ebuild     | 105 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index e032f00a928..fb1d094a218 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-68.base.tar.xz 2112828 BLAKE2B 
6d6da1488df427a6c1530c0e855e
 DIST genpatches-5.10-68.extras.tar.xz 3848 BLAKE2B 
90869f9c59d7f73af938c4aa0983095f4eb03058f53b71a3499f1829ed2fc227fb162d80b0d9add62a9a2b7a350226a55fb7aa884d2a0e7c3c63ac94891bded9
 SHA512 
18e41fdf3a4452eaea54fa832534cf5efb6af5bee852e67a664407c6cb4953f81b33870bf24d9450f92ca824548e53c67c57d938dc9c675aba8f2b18ddf736d3
 DIST genpatches-5.10-69.base.tar.xz 2119352 BLAKE2B 
5c861ffe65077143e0778ece1334c90e9b68b432fbabae79cd9821f9b3b237c7de5964441b34c1fc58a93f980d801db6e85c76428a760c2ab83817dbb28bb61a
 SHA512 
54f1e20cb7ab890f77ab29674688746fe1bc1953113ee4bdd850d35aa656b9088ce10e33ebdf7742f9016e5ccab8cfd4eb951e2bd77c5a356b155b9d42d35253
 DIST genpatches-5.10-69.extras.tar.xz 3852 BLAKE2B 
b950a181ccd370fd35bb350f3f9ad7d1ffd7b6b9d4d0ef2cd3c0cc9bcccf663915bd7f155d47f2c083ca929b0c741075f4d4c5efb8dc3550b9e197eef57ae28d
 SHA512 
49b3d652d4ed9d074c316ac41fc6afd5df60edde44bf8999cb4dea7283992d056fe3824eb16a9d7881a8a058198dcfbbf6aae65ce34d051e1f55f4cf2324c178
+DIST genpatches-5.10-70.base.tar.xz 2126552 BLAKE2B 
610468f17ddcb59e9c5cde16b7fbd10fbae4483944de78299157ffd38b27e6ed6061f3bb2462fa3f3afad418d1202c60c7400e19ba6874e46550fc346fe3ede0
 SHA512 
1912be230024055424d5a0ac7c55bcb3e2ea2a93fe4fb1e3f1bebb39749b765a8121b5443dbb3159b9b13080e3c153b0c30829f378c697a6f7622e91d876083d
+DIST genpatches-5.10-70.extras.tar.xz 3848 BLAKE2B 
8a099c38dc7c5b9662d049d42b18e073e7cdb1199b20a393672c9e3ba342d3453a23fcbc1028ad63b757e8a5cf0807767cc18b3bd4c6aa5abcba3b4247a2114b
 SHA512 
960190d4aeac06b156da135e390b949e47227cc0926cbadff0c643395deae61117eb025608a5c621c6be35edef71d670714c382d151fdaccdcc4ad063fa51654
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 
328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac
 SHA512 
08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 
61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651
 SHA512 
20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B 
fa70753d96944bfe43ae352592be5fea8b8bccbac1f7412a241d951b5009e4643e12123ec3aa6864b9a884fffc744c8ec0be84dd499a29dcbf3c36446b013842
 SHA512 
814b3766c5330b5890e63ab47399e91981c18dccda37797983076ec860e8d2056f112706a07acd1f5c0f72a5417a8713d928b473695f6669fe734de025048015

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.64.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.64.ebuild
new file mode 100644
index 00000000000..8a97f9b5278
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.64.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       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 hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/pahole )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       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
+
+       local myversion="-gentoo-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+       kernel-build_merge_configs "${merge_configs[@]}"
+}