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

[Michał Górny]

commit:     8f64f32f0eef859399c6541abe10e6f2dee82b09
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 15:52:24 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 18:13:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f64f32f

sys-kernel/gentoo-kernel: Bump to 5.13.6

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9e58a3a5bfc..eef14fa408a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B 
afcec75958e44f3ef7da0b2ab3e2a3
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 
9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c
 SHA512 
a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 
810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8
 SHA512 
237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
 DIST genpatches-5.13-7.extras.tar.xz 3420 BLAKE2B 
431ffe1f40ef695161540131b2abefb5d3bb993d48dbab6224f6e3afcdeb8e618b3b8258dc3ec170a2f53830591f7363bcf8a21b0743f04cee4ba5af294d8cca
 SHA512 
dd7f5488203f98395b0de62772e353907f11bdb23ef92d049ba785e5ab5be23d066bac4dc5763226057f0ce5fa957417c0435220e4702f5bc4d66c412124a04d
+DIST genpatches-5.13-8.base.tar.xz 536800 BLAKE2B 
9805becf97795872d763c43cbaf81c2e9dca63764c2ea0237af5da3efd0d2f83f90d14b4581c98eb87a11b4b28b17116637006029858e68a9416b8732cf7321a
 SHA512 
da8583f0f3620daad689ba9d32cae938fd1332f38cef212e9f1281ed138480484838db67368e1ed5d0663af150b0ae681bbb20f309e4953973f185b58273cfbb
+DIST genpatches-5.13-8.extras.tar.xz 3420 BLAKE2B 
e0c844f9b463f06b5c49dcbb798bcf489854bf9fcbd1973ad3c3168098bb6559e5236a49ddb0e351ac8642ec85c7494b238ea043c02e4ca0b01683343b524123
 SHA512 
5a8d67139b53c4f752970471afdd35980b64abb9d5df16e3ef3ce384e46808a56e15b40140a8a4f9ba910df8c7c7cbafa17ca6ac3fb30f0eea69ef13d86b377a
 DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 
085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa
 SHA512 
96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
 DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B 
f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5
 SHA512 
a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 DIST genpatches-5.4-139.base.tar.xz 3773732 BLAKE2B 
f2eaec4646c9391c5683421d702fd11c4feeac38d37f05d4dfc2b21702c9d768d9df769a8330cddbba609e92baefe62b008a2289cb31e48cac9ca4662a6b761a
 SHA512 
65e3d44fd4ed2d3c97ddde80feee75c19b63f103fd0fd80124a1c2ca95c2655061ef76d2b576e6357cb26a05c452f8f2ffd3303d9cdbdacac89337e736793492

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