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

[Michał Górny]

commit:     770de2d5676039806d685ef02b7f6b033cbb04d9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 14:17:20 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 21:14:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770de2d5

sys-kernel/gentoo-kernel: Bump to 5.10.74

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 4a338f600be..e7e1e50adaf 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-78.base.tar.xz 2372000 BLAKE2B 
263371197ab54e9153bef37cb34f
 DIST genpatches-5.10-78.extras.tar.xz 3848 BLAKE2B 
bc1f534a45c748e9ad1e6382349853d58c93c51db7deb411ea5fe981edc983c3df1d62034af582da4740c8a8c5f3617bd8e360602f806808148e2a0e66b6f327
 SHA512 
d96f7924e9c7c128eebfc3e73ddd54a501a7909a5d51bf74f062988113c7a2b3671813f875018a52395f41aa6d3fb86a35e57422b19ad885e667e1bef693cf9e
 DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 
2da2a130876482ac0c4c2959e4faa7931fbe6037c03da78f7238411b132dba8e7e196aa5102b8b74d1996bc9f7d29b435c506954f6db4c91bf3b0a4ff39cfc46
 SHA512 
1034e28b4c880c285999ddb47f3074a9885fcba6716ce58bd121a654f20f0ee168fc454475517c3a2c9e8327f1a81b5c68b26a114ac074c425be68e95eab3472
 DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 
9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504
 SHA512 
538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
+DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 
663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0
 SHA512 
ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
+DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 
401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3
 SHA512 
88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B 
ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726
 SHA512 
55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 
5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a
 SHA512 
397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B 
a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce
 SHA512 
add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86

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