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

[Michał Górny]

commit:     9458cec64f1853d262acc94ea1a8de6b8d788f1b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 16:58:05 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 18:28:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9458cec6

sys-kernel/gentoo-kernel: Bump to 5.10.80

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index e93142ab10ca..323b29a50839 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-85.base.tar.xz 2458980 BLAKE2B 
56a0fe583f9db1bd5d1a051c584d
 DIST genpatches-5.10-85.extras.tar.xz 3840 BLAKE2B 
42ce8a5ec14ebdb8067853fc388b30e178e705e53d6ca547e21ab76bf94ddad1368000226ab455116758cb6ce01e8a8624332dd217b2d49d6ab3393d6f740966
 SHA512 
10bb7747d4d23203c39cc0f15abc70e5dbe8f3e390b2c95338982225634b3008e415c372b81029b85e0f6619112c65327e6acac5de0fa3cdf58bd8ac30607803
 DIST genpatches-5.10-86.base.tar.xz 2463088 BLAKE2B 
34f37eca7a8880c76aac81efb164d5da205cbf9d958a1c678ea570349ef156d71ee49a6557f3c8a4229b7bc2dd22424bb0cf0f2e9b7eb404025640add9c1313b
 SHA512 
133f1704d806f929cc8c4a800fcece05985c55f701bba05061f6413d545e40ceecad5f54cafb20d677e176339cbfc95f36e9ebbcb8177349de5f0666ccbebb77
 DIST genpatches-5.10-86.extras.tar.xz 3844 BLAKE2B 
608aba1a5b2bedd005b48aa58d066cfcfe7f4219e89ee35f16ba25da443b9d224aab29986623bd640565b90aba1f5bd347a278d55f2e8a23c876fcebbff4444b
 SHA512 
848711bf665668e7023ad26327b2a15863eade161330885fab8b8d1cb3b0d59568c3bc7a780f172178d526de704987bea50fe319a12a68df60c11761250f3339
+DIST genpatches-5.10-87.base.tar.xz 2594680 BLAKE2B 
ee5823f80add6faad8cfea1c36e3597ecc0292c5f98b64844fab7c76605fb369e07f4ae48b2e39d3d17879f0befe37cd58a45734c47c73c7572522afb01cc6ad
 SHA512 
15b8d5e3e8403c4c9139fad59382e37a5e211ecec363c43ca385b529fc292a0439c9f93e7b525949bf1519c553111acc96107d0195e11cdad77b03d905bbfdd5
+DIST genpatches-5.10-87.extras.tar.xz 3844 BLAKE2B 
7d06efb6943f262cd37cb9c93ed4b0477943fc267499a80fcf1a419641286c072fb8cc7bdb061593be0861e437bc347e9cb4443257fa40887c0875780c76e80e
 SHA512 
c3331486191e9e7e51dd4bde83c2f9a3c76f7753f0e2ff3b1c0dd661e8eb73d39653efdce7e084aadffb55e840de84fe2f9a4878101334bdf0d52e2389e67156
 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-15.base.tar.xz 544344 BLAKE2B 
5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5
 SHA512 
963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.80.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.80.ebuild
new file mode 100644
index 000000000000..101b27accc36
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.80.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##*.} + 7 ))
+# 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[@]}"
+}