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

[Michał Górny]

commit:     144a1a8df67f6858221f17e2cbb8fee033e849a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 12:30:20 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 16:01:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144a1a8d

sys-kernel/gentoo-kernel: Bump to 5.10.66

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 01130f8953d..40aa09db7d5 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-70.base.tar.xz 2126552 BLAKE2B 
610468f17ddcb59e9c5cde16b7fb
 DIST genpatches-5.10-70.extras.tar.xz 3848 BLAKE2B 
8a099c38dc7c5b9662d049d42b18e073e7cdb1199b20a393672c9e3ba342d3453a23fcbc1028ad63b757e8a5cf0807767cc18b3bd4c6aa5abcba3b4247a2114b
 SHA512 
960190d4aeac06b156da135e390b949e47227cc0926cbadff0c643395deae61117eb025608a5c621c6be35edef71d670714c382d151fdaccdcc4ad063fa51654
 DIST genpatches-5.10-71.base.tar.xz 2187796 BLAKE2B 
15ae0bbd5c6686bde24603a03209eb82b8cb4db57599b8f30b3a44701df32d4f541d0c054b9b461f43a64e4c05704d5dfa7278c9b571924f03c6ed64b2330bd8
 SHA512 
e90c0585b87608bbd1e87b0f10d199eb049560bc1907e6afa6e0d9063ec518218af3643ada7fd7c855ee4a7dd5db8e62449267bff3adffffda7868b4f89cf381
 DIST genpatches-5.10-71.extras.tar.xz 3848 BLAKE2B 
d6bdedf650b6d7d8cbf35dfd7ecb22db6f1967875e6e12ee79412016e21bb6884ebcf1bdbeeae97211f30c6fdb97f4c7e4a89b1f4a944885a5ce419cb85adb4a
 SHA512 
439f9e6aaa226946015d58dea7c5cfad354eeb342172e5632027900a74f103d30d8cb7140ec2e9b60168dc8120bcb2ff10726e14e53f64678e8ca0cea2931b39
+DIST genpatches-5.10-72.base.tar.xz 2188200 BLAKE2B 
7a7b204c451dcdcf9d55e015d44d8c10bfb361a7fc8799f8087c3abd11a56c917203d280eef887a303d8d61c54b41548973614f82d71f339e7e554cd24785d93
 SHA512 
900ba435038a8b7adce267b7ec4a8c2dbc71d6c81c53fbe34afa09331d113d3dae3c0c1dea8c16638e9d0a6a8e8a073d800b2e770315b116be3b14bd4c279467
+DIST genpatches-5.10-72.extras.tar.xz 3848 BLAKE2B 
95774f94773c6ed5270b308d0602f4de4b088583fa6d1c4d9c36ffbfcbeb1fb979218581f3eeee34d54bd19363b81d84c7358749f1b6f2cee747d969947f3ea7
 SHA512 
a5d60e742bce8fc26c641eac9618a9b5ae0f8727419b83679ab2f660038ec72307fd7c523a1fe0e99f22735d33f813f401d4c5b821d690f0235b74670f9ed95f
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 
328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac
 SHA512 
08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 
61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651
 SHA512 
20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B 
fa70753d96944bfe43ae352592be5fea8b8bccbac1f7412a241d951b5009e4643e12123ec3aa6864b9a884fffc744c8ec0be84dd499a29dcbf3c36446b013842
 SHA512 
814b3766c5330b5890e63ab47399e91981c18dccda37797983076ec860e8d2056f112706a07acd1f5c0f72a5417a8713d928b473695f6669fe734de025048015

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.66.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.66.ebuild
new file mode 100644
index 00000000000..8a97f9b5278
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.66.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##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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[@]}"
+}