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

[Michał Górny]

commit:     812e61e0a90929fbbea05be2f39dd353c1d3699c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 11:10:43 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 12:33:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812e61e0

sys-kernel/gentoo-kernel: Bump to 5.14.10

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index d2b20d3e329..1eff281ac86 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B 
ba681ca3732dd42d0242c2b4e95f9
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 
5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a
 SHA512 
397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B 
a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce
 SHA512 
add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
 DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 
3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8
 SHA512 
7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
+DIST genpatches-5.14-11.base.tar.xz 446596 BLAKE2B 
c7ea616d473fb6e07af15ad0cd400fc4397dd9833af139fa19b23d5175959de09c5b2eeea1efcfa9e76133f4f07cc503245d03d2f7172dce9e677028d69b05d6
 SHA512 
b4eb0036109c628c2a4648edbc2b601da3003f7bbedd0c9811fed22c472b492763ac74b61f36cec896ea04641ead861522d2447bf88ee0302f68a8ebe02f566e
+DIST genpatches-5.14-11.extras.tar.xz 3848 BLAKE2B 
05f652b6f3f4052b5992c747ce8354c8bc6ab64a7197150c223f868c0060a55c289dca650d3dadc804bd39cc661dab56d7d8086c5dd9715723f17c19320960b2
 SHA512 
509e95a8dc4a1e2d1e28388575664006bc5c19eb5aa05e45999838c7cbaec875d784a85f852e3207a37047fb27fd5733a01f95c4d488ff1275661343cf5694ee
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 
1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f
 SHA512 
5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 
6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88
 SHA512 
d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 
801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d
 SHA512 
a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.10.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.10.ebuild
new file mode 100644
index 00000000000..b7a0d9f3417
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.10.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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+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[@]}"
+}