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

[Michał Górny]

commit:     bbd93aeb48c9f83dc41c624651109bded25fdb9d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 14:16:20 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 21:14:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd93aeb

sys-kernel/gentoo-kernel: Bump to 5.14.13

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 7aabd8a41a0..4a338f600be 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.14-12.base.tar.xz 459100 BLAKE2B 
ba32bf5be3d9e3e332659281495ec
 DIST genpatches-5.14-12.extras.tar.xz 3848 BLAKE2B 
0bac1f83f9ebdc3b6860516313ca95d5ad2e1515bc587a3e6010bdbbd2bf3e55fe3acb835989ea874608149c3efcedf172451322ba5e5df821970cbd210a69ab
 SHA512 
9e4c5445b0883680ff28e24d2b7af4d6dbd4d2f54c33583c5b91e0629caa5cac02b02996c52cf277909f057c8bd2f41342cd57f9e6ba9d8b4a8895fd70bcabaa
 DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 
54de53dff2214469b24b173b17aa6a4cfa2ac50d8834434c0e50c5538484e7a16c3822b677572e4d2bb444266196a272487df0264c2fc4bd25e6fc6a7b63fb8c
 SHA512 
205d403607618c0ea1e82ac9ba48cd1e90e961e92e282a5bc2723408ddd7a85ca871e91b23cff37c3108f37f4040fbe063928161cabb175c78b7175ba8b60974
 DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B 
d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36
 SHA512 
b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
+DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 
5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311
 SHA512 
81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
+DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 
5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1
 SHA512 
1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
 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.13.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13.ebuild
new file mode 100644
index 00000000000..b7a0d9f3417
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13.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[@]}"
+}