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

[Michał Górny]

commit:     2e5c2d7d28bdfdf800e44606b8ebd628064f6ef0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 16:30:06 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 19:17:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5c2d7d

sys-kernel/gentoo-kernel: Bump to 5.13.17

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 34e6865e357..d8d2ecaafab 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.13-17.base.tar.xz 746560 BLAKE2B 
6a34e85e1c866859df8850487cd5d
 DIST genpatches-5.13-17.extras.tar.xz 3852 BLAKE2B 
e68187eb92f6f96affc059e7a0ae80481a98b22d8954b40f72e8e51c4f3f86a6dcd54ec7b97d23f381f4391dc1abc56c07b81e5faf1291e7b49dbe6170c4d2bd
 SHA512 
257920ec44c4e03c37b5e2fa77a1559545bc721dac89e0d792dee27c6747f008d6cba8eb5ff45d78c3221eb128e899139ab913c472af1cbb21bc9e76cef29925
 DIST genpatches-5.13-18.base.tar.xz 753548 BLAKE2B 
2aeb182e609c2043b87a146b912c7a36674b87451d7d469e8538e070ee0b388cae70bf040341798daa7723aae5f490e6826c94374af7a4d1817e1ece54f6279c
 SHA512 
b795d49d7f386aba7c35aa5a3b8ecb1e9bbcdea424aef77251cea12d64b213410c883fcf58e9131437e78e5c63d435d84d8c2834ca5a679f65b7807b026d60d8
 DIST genpatches-5.13-18.extras.tar.xz 3848 BLAKE2B 
f4649e2c359dbd01daa454b1a63534f3347b21e8746a8ab72e6485090b7a3eeb6cdc68cfd2def0f7cd86410f075bd7ec859176c9286d247870a4532f035e45f2
 SHA512 
963288db0a789baa4c8e588ce77a53391146071738e56979119e83cf10eae176ec49c8a084cd6057ad2c839ad2b19bb1b09790abd05c40f8906a973bcdb87f76
+DIST genpatches-5.13-19.base.tar.xz 835196 BLAKE2B 
268a688e9ecbcf76270832c0f06ff0f550d0565d9010ce7d6d4efc786028d34969b0d7b59040ae6b4af4d662d10e44db85b03fda69463178879fac844d8f4503
 SHA512 
f388dd1125f380d72f96a518438a5a50d3bb15c7b70521b2891f6dd0b14dff8007454b4404d2fb35d711b63bff93b7b67f0aba987aa634fe4a13d51098b261bc
+DIST genpatches-5.13-19.extras.tar.xz 3848 BLAKE2B 
c4e2deb3c9f6d249b134a1389874e4f4c9ccce5e3edbf82276cd243742c7955455ed55b21f7553c48476f827adfd45e210ccca71f28cb6ac51d198be9e6ca68e
 SHA512 
21b19ca96e353ded2fab8d0c673574fadf6a5a36cc40351063ab9550656ab90319d46ba91051da21de33d02d397af6555ff557d877baa323958e220423892ea3
 DIST genpatches-5.4-146.base.tar.xz 3857908 BLAKE2B 
fe3119842aeb3f1f8ba9af26d4db1773380400397b132235db8071c9c05d395502c8fb08cc690842cbde5c5fc8dd5fa456218d2f95434ca84422c6398889cb03
 SHA512 
d293600dbcc8ad83641d4866e4998b1b4fa3bb254bca9e0aabd4d94bdf6270b7757f69874e754a38afb8426e91a4072e5c135e12c2a597008cef77f6fd74b7dd
 DIST genpatches-5.4-146.extras.tar.xz 1784 BLAKE2B 
e3b75e9f8f29bcf441dececc62a46cd5db846859bb9fb01462846333dfb42f35c559b5b6533035b891062de619dac678b9467fd0432423bcd8505385c0beae47
 SHA512 
0923ebf0da182eef762653b282fad6d50862c3d520ee1888bf8fb2257b96bb4cb06a3e88ec0b6a8587f17c97f9660ffbaf4695eb0d0d0f46fb59861b49949e35
 DIST genpatches-5.4-147.base.tar.xz 3875304 BLAKE2B 
98cc4815b004967ef7a00b2b8af96cf002c09b22d54222e0f932e1ef83731846011bb3c4b8f972c85aeb086b0bcd6a0ce0f2ed390dd5f0225b137b33bb2255bf
 SHA512 
999f5e9a99cf8dea0c8da91b0e365703064620b04bcc48909d89af73f551a0da3785201b4a4fd0edfd184872f81109dbb78ca57d95d1c2759a1cac111fe1066d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.17.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.17.ebuild
new file mode 100644
index 00000000000..4a581187e0f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.9
+CONFIG_HASH=eb52b35e8cb097413357b578903bd18eb76051c0
+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[@]}"
+}