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

[Michał Górny]

commit:     6922037240dc731f3399e07cb893f14bd7e42911
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 10 14:01:46 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 16:46:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69220372

sys-kernel/gentoo-kernel: Bump to 5.12.10

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 21d8f18513f..56dc731c209 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B 
c3e0f5840c32292d36be31a86069
 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 
0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8
 SHA512 
114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
 DIST genpatches-5.12-10.base.tar.xz 564792 BLAKE2B 
127e64196c8aa0b65dab7de4dad4b97052c53451f27a1948453d8910afd59b3a5c4ffc316a439bd053b433b057df127bb252d994f6447a82dc1434eb317e0d1f
 SHA512 
e4c9eebb61de9af0fa4a53472c18f39f87196a804c63ff796eff992f75450719400e7bed5cd8ddce6b09db8330be443ddb2ce0241d8058aedcdb5e332a4178eb
 DIST genpatches-5.12-10.extras.tar.xz 1772 BLAKE2B 
31e3959f1dab1ae1ff5f39b75c455e559e96bd4527e94677494accfa75fd14df2667ecea8ba5df59d3fa1ec9464ba18a257a8a5e76c0602049732f66829785ad
 SHA512 
6e2bf6f7eada61ece1f65d1461377ba5532dd45b57b58b7ee6dae9485809d4c329c6ba8d6d0d0ee9027612a01946f756069b50c44d60d2f543e9864231abd676
+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-7.base.tar.xz 447756 BLAKE2B 
c7d1f923bf45adba7a60ae56eab5e6ac3e132f6fc9186da1bc10d48c19dbf7ab39fc07cbb93112b39b13fa921223b1f6aedb28e2d053600b7787a2bc2b55defc
 SHA512 
ee12bac503ec5ff48d918240b5e16c03df01378d572421d648863d82db8c89a79316d1c0339b6156cc5c1a0de64cf20e81b2900fd23b96f0c274a171e90aa279
 DIST genpatches-5.12-7.extras.tar.xz 1772 BLAKE2B 
3f593739f9330a6dab17be9307c163d6ca4e39e821d79db2b6a3f88b3af8c973c713be26ebd11d155d18336f9613fa5b0c9c44e43c0674bfc4f9e0c5d7519874
 SHA512 
e273b619d284246670381a6a6bc5f9835a6ed7023bfae14b31783242ce504d6909a5dfb47e6a5cb5d81cb499fb897daaeb8e5d0306359a47ba22e0818d499d25
 DIST genpatches-5.12-8.base.tar.xz 486256 BLAKE2B 
55607b8e42132706dd6d5b2716ec252fdae5b7b2d0e4c7874aa4d9f558172f207d7597eb77030651a5c490b86eedeaf1174e9908277e989e06a4cc048b1ceecd
 SHA512 
3651b48fd077624d7e9b9471bddfa3ed0b5d4656374b73b92192de26925a12b3c4923dba9764ff12c1fad94047b404c61f23cd2eb4d4383775eaaa0ded3e7907

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