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

[Michał Górny]

commit:     e2cf113ea06a0a8fe338e8224926925538afe2be
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 15:31:06 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 18:56:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cf113e

sys-kernel/gentoo-kernel: Bump to 5.12.11

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index b99d93f03ff..43ac9130849 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B 
a4078ace7edfd91eb3ec2f63cb12
 DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 
779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4
 SHA512 
dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
 DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B 
af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2
 SHA512 
f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
 DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 
2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51
 SHA512 
2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
+DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 
81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e
 SHA512 
bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
+DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 
8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458
 SHA512 
39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
 DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 
0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026
 SHA512 
e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
 DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B 
da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5
 SHA512 
ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
 DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B 
a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89
 SHA512 
c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild
new file mode 100644
index 00000000000..5597a415b91
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.42
+
+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[@]}"
+}