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

[Michał Górny]

commit:     ccaa582ee387bc91e9cbbdf8782ca3723509dcd4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 15:32:07 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 19:31:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccaa582e

sys-kernel/gentoo-kernel: Bump to 5.13.13

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 162e170aa4e..7a52b8a36fa 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.13-13.base.tar.xz 634700 BLAKE2B 
2f9a12c64ec10163426b9e9b59bd2
 DIST genpatches-5.13-13.extras.tar.xz 3476 BLAKE2B 
38f1f19267bfc6319b85ccb1e566dfeddae282c86a0c31efaec53d97ba60fd8c8294ba483e22331fb35aca4d0cd5415b6e51f2af5f63122eb99172fb816aaa82
 SHA512 
9be0db5a384974f5ef1637c9dded924b83e056e874e41061b9793846602c43dc9960ab7b32b0d3f9d50039384363a85f29b56ff8d4be1d6b2005f7978bfc4634
 DIST genpatches-5.13-14.base.tar.xz 677956 BLAKE2B 
81d1c4280e45d5b4c3161d0faa1322c8aa63af7a431c647c4d191225fb905879aecfb1f172209213ce3da7b2b12a95145473066aaf1fbe369ece67338ee20845
 SHA512 
a9d858b4235238844527f95b5eabec6b6555c514691cbd001e25f437827f90b4a9008dfa297541ff287ea69bb2082099f179e8bd9dfc9fe75d0093eb47d18576
 DIST genpatches-5.13-14.extras.tar.xz 3476 BLAKE2B 
3d51a9825a501f86b08f08a8e5945f8e3b9a95a4306bed9bb4a9b5730ba2a1d98fa2af30858c43dee25c0a4ec15496e22c41214ea36c75e0e1356036d7597464
 SHA512 
40abfb5bba735c8de649246bd7f7af325e7c1b86f7c02a41323dab17baa78af6fbf089724af701f646b5fd59a4e8aafdaaabacbbd70e70fc26df71dad2019e04
+DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B 
fa70753d96944bfe43ae352592be5fea8b8bccbac1f7412a241d951b5009e4643e12123ec3aa6864b9a884fffc744c8ec0be84dd499a29dcbf3c36446b013842
 SHA512 
814b3766c5330b5890e63ab47399e91981c18dccda37797983076ec860e8d2056f112706a07acd1f5c0f72a5417a8713d928b473695f6669fe734de025048015
+DIST genpatches-5.13-15.extras.tar.xz 3852 BLAKE2B 
17c24bda81640a2431729cafef4e6401902390a57bd41ee691e971fadd54761a8829a559d201d46f883bcf99fe9ea34509fc7a95ea90ad3fddbda732878bc278
 SHA512 
4113f3e6ced039f6aeb89a8033d88140a993ebe1bc99d7dd2424f90846e217398551bbdf67ca199acf42b9af5aeb8a144e84bacdfd444f170f1a0a747fb1c477
 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-145.base.tar.xz 3847680 BLAKE2B 
4c35815c7e09626f3f9f15081c0ab3eca09a26619c827d0db2f4d538d9ece2d80bc058c0132d479a339a609469d55b0411ce4341b444eff92357133346e059f8
 SHA512 
75f6a0e98b14c6c1c50c67cb4e8bf819b6a02a755900313b286aa7b50e319020501e8d0113028f2d00c68f46dcc605784521edc330a28edeab9e77fee4ba3d50

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.13.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.13.ebuild
new file mode 100644
index 00000000000..d77a7373c83
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.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
+
+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[@]}"
+}