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

[Michał Górny]

commit:     23365e5315d0dee4a0d65fdc3ede8884b38fb1f8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 15:57:20 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 20:03:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23365e53

sys-kernel/gentoo-kernel: Bump to 5.14.18

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index c4f9f41ff1b..fc8db47832a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.14-17.base.tar.xz 622212 BLAKE2B 
a0c5bcabe08e292287b57cdbdd573
 DIST genpatches-5.14-17.extras.tar.xz 3844 BLAKE2B 
f50d2d3e47b0e0387c68eff502be6163a167436f6e99a59a56420c1f4215cee35a892b95bcfb2b2f73261db57b52675f080e90a3f69512ba00163bef95cd8e94
 SHA512 
eaed5b496a124c94093d85cc23d73b345b9bc6b946656fa9e8f3d7eeff719303841f199d9d1312b4d8b69e7f55883a3c8961d3cd568c5ac48390850511c936ad
 DIST genpatches-5.14-19.base.tar.xz 626596 BLAKE2B 
8edc9633b2344dd484c39e12ca58b7eece9e442ea6440f7db647c9bcb11ffd72d8eca9d770fd70b82ae61bd38f58613b78be84aaefc18d3edfca7a965654aa3e
 SHA512 
7a6b1bbc2d6badd509b1c0c1106a13eea7b76e2d11e52fd8a805d811b1014a68b6a2dafc95c128c20dfb64ac0db2b71f5b404e7392917e997c585ce5af2234f6
 DIST genpatches-5.14-19.extras.tar.xz 3844 BLAKE2B 
178ac464389a96c166e30e5fd16c33754722c74d7cb63f458719fdcfaa582c21d18c983cdb96747d331c1f1911ea8de16cf812efde0075eb02164201bc077be7
 SHA512 
132393c3e483a1142e240941439137632ed153e14b9320dcb8cbd41115781ee2874954d87463ae0c6154029f078d4b40e1ab63d52ae2f48a733f86cfce677e13
+DIST genpatches-5.14-20.base.tar.xz 634440 BLAKE2B 
44ad4acf9c899d22a6f02c722ae18a21796adca21e62208fa5f70e3b131a5e3cf92ae2343e0ed7b86f6dce99bd52521acb619f6b6c603b7913c438be13f06547
 SHA512 
03557b7ed31a079d1e8a5cd5a917c517e68c88337d5fa61cb528bd39837cb6cdeb74f9e9648ac3a41f9ade4edb5276c94d9b56fc72131814d5fe3daf3c72f03e
+DIST genpatches-5.14-20.extras.tar.xz 3844 BLAKE2B 
26b9e372ce744f8a6af8858edbdfc23be85123ba6de3d273d11ce67be3ba2bad1c4c7611039bfb41796bf49de14bd5c2769cbf49bee4cdc0bf5148d34261cd47
 SHA512 
c51a656e02e5438d61eddfae64c7b62277e30c9d1f8e1d563f812d484c931c37de5a04c4ed23afabde7c39e3e2844aeb25923e7cefc1a948a6617bd9c72277d3
 DIST genpatches-5.15-3.base.tar.xz 9472 BLAKE2B 
209b41dbff1afc55ce8a56332805019848e52d736b90806cafdf966d73f278f301ec466078b6b17c3d558e976c8ccf950bc802e365b06e412bf4f08434b7a9e8
 SHA512 
fc489ceea8f768cdfca365fb821e7234e7e3a9e650170e81e182b96754494f840971acd29c0902cd1ff3d192dc059755212d0618118b63cd1b62a822182bddf5
 DIST genpatches-5.15-3.extras.tar.xz 3840 BLAKE2B 
9fb781e2ac7afd8c56ec3af5d4dc8ba8c1577716b429b04d81cf070debd3f8762933a8388e836007ce4fff0a10be76f97e9707b6f2893f1767e105169b0a3c41
 SHA512 
93191bce6b2c6d029b1a703b9edc77f8f9567b791a425ad9e4be108747f398083fa9adf0a4dcc92b5b140f60fdf74ed59260ca7bd630837a88bd4645812dc94b
 DIST genpatches-5.15-4.base.tar.xz 20904 BLAKE2B 
01add5a35e7eb969a41239254c8a5f3a70f7ff2775e2c3b8e6c3fccf756795a11c5645c0382c03f8225a36231671570cb984382355844c080c7607dc4a5901cf
 SHA512 
6482bbe1af3c60b065541f6cfe1eb44e4aa3ef375533397c58372ef68fd418dd1eac21d2505d78950953c833a28fe2a03105b6ee5f7128e4685d7f4f568a596b

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.ebuild
new file mode 100644
index 00000000000..7bd79c6b587
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.14
+CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
+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[@]}"
+}