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

["Michał Górny" <mgorny@gentoo.org>]

commit:     d980c6268ecc60f7720d5c77b2ffaa59e1473098
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 12:59:04 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 17:04:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d980c626

sys-kernel/gentoo-kernel: Bump to 5.10.58

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index c393acb9c35..9470b6f5311 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-62.base.tar.xz 1996836 BLAKE2B 071dcd4cd4ae685c020e460a5858
 DIST genpatches-5.10-62.extras.tar.xz 3436 BLAKE2B 625104ad203699aa2083281ab4e1a9e0565cf3418dcee8af30632570f90554e97f63d70a89f3de43f0869857fc47cfcd6ee91083b398dd241171c6389e647d01 SHA512 013772cd15a03dd9bf193a8d45330cca268ba45e604be4670edbd1489ee2435aed0670fa40de33b63a37d8c802bb3ffc7e8442185023170d2ccfe79f4ed7a38e
 DIST genpatches-5.10-63.base.tar.xz 2005108 BLAKE2B 2895a5f99b7598f6eefeece9f0eedfdbe3475bcdf9272092e73d5899ba3466dcf2252da8718242c7ab02d593f9bb282dce41a147cb7e1498442b57633127568b SHA512 d5677d3e07948c2f0f80b17e4446b53903b2bef2c8fa406bab60009a2d2898f5c38f0df8b24fe46ae83ee0022d4de650a89bba94787479d6138cf21d1e2927a5
 DIST genpatches-5.10-63.extras.tar.xz 3436 BLAKE2B ec9eb5e22a6870a5a9fd278921b04488f8ca470f5b0dba897bf54aeb6a16e60ea536348da783c6d018ad0973b11d97ce2ceacbe89cc57efd7d0563e61d0735ea SHA512 ea27955830cce24f48928a566089114cfff5f35f411084e1c5bc815e9dae3049932ec6f2b3b308f85caf728cd713af1225b4459d015b01fca61e0037cfd4b45f
+DIST genpatches-5.10-64.base.tar.xz 2033424 BLAKE2B a5eba2b3d26f337f34690de532ea28be6d9a4185557d08115beb0d0edf21c4aac3cbc9651b20d877980e05d564842de9b9495e39df7e926000990ad94ba5aaa0 SHA512 f98bad4bf91a3af6b06fe831f33c8253117d30e9c8ea719be30ec4ac459c00ade6a6c2ca057da8bb6706857c1b29ef7c8a25231d83a7127bf5e6175c584ef6e6
+DIST genpatches-5.10-64.extras.tar.xz 3476 BLAKE2B 3f5cc7104d9110b7c35f40bb9725113f5877d419f5b6c6dad80adaa23685f2a27dac371d1f0d3b40564a9e88d4271a2002c46c60d7a038485a3e55a0f0eed0b1 SHA512 d21427490c13342e2eb56174c35dd0ecd9f7e2d43b3a9e7b9b6103a82cb58f7d3e647b752da74d7d05495345e7495d33a1acf20c1c4387c796eaeaffe2bc1e5e
 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-10.base.tar.xz 573992 BLAKE2B f3de7462b97e0a2bcd38edd0cd7972b3da8f9d14b5874f7137bac5e6193c046b7405b9ce4e3d74c6f72af3a83e731ebee65aa8884dd28124907090c489d04a93 SHA512 12707bcd389647dce3dd90ab0e0d3a604d250fa43f8634818363c6d3e7b260e392402fa8b5750e72e5e1e2937323a689c3d5ef48f5ec9a347d77eeccd2681cf3

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