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

[Michał Górny]

commit:     9805f3304f8a459ed2ab151026ea7b4e8a890912
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 04:52:19 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 09:22:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9805f330

sys-kernel/gentoo-kernel: Bump to 5.12.17

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 581813c81d8..bf24ecc0f61 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B 
cf0e62aad4cbe5c00d09a47e90176
 DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 
783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3
 SHA512 
53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
 DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 
63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807
 SHA512 
8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
 DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B 
dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd
 SHA512 
501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
+DIST genpatches-5.12-20.base.tar.xz 920044 BLAKE2B 
97f6f4af62985d17004816190f55919cd937e29e24c753c0c6d82ec6bacf89b4faf01585f941ae33c5b37d994888b7362d2ef22add518e4f6a2df3fe3b23953d
 SHA512 
6f5940eb48c8167c7492701968e72138ec8a35fcf889a45158321a4507c45c5a930b68b2156410fbd063155093767a239d4d9cb3711c81ef47a13313b327c07e
+DIST genpatches-5.12-20.extras.tar.xz 3420 BLAKE2B 
c161c55413cea9c5776773d0910219a801d21c6e16de8816bc909d120477e7d6ab0d40c8a4bcb7b09f2227dc70c8cffa86392147acec9e20d2bf0179231c0926
 SHA512 
143eb7972c11aa69d2a81421309ba84de370ae28511366dc8264c52a073a4069bbca19cceb6fc0bef9410441ced95d1984a18142df3207aa20ee783e40688801
 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B 
d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463
 SHA512 
d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
 DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B 
abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907
 SHA512 
121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
 DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 
475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044
 SHA512 
4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.ebuild
new file mode 100644
index 00000000000..8cc6b8c1b94
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.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
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+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[@]}"
+}