sys-kernel/gentoo-kernel: Bump to 5.10.60

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

2 files changed, 107 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 153b8fd65f78..949cd7bc5dd9 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.10-64.base.tar.xz 2033424 BLAKE2B a5eba2b3d26f337f34690de532ea
 DIST genpatches-5.10-64.extras.tar.xz 3476 BLAKE2B 3f5cc7104d9110b7c35f40bb9725113f5877d419f5b6c6dad80adaa23685f2a27dac371d1f0d3b40564a9e88d4271a2002c46c60d7a038485a3e55a0f0eed0b1 SHA512 d21427490c13342e2eb56174c35dd0ecd9f7e2d43b3a9e7b9b6103a82cb58f7d3e647b752da74d7d05495345e7495d33a1acf20c1c4387c796eaeaffe2bc1e5e
 DIST genpatches-5.10-65.base.tar.xz 2037624 BLAKE2B e2a41a62a0d01260e75bd4eb5eb1674fea3f00fb85f60460878039ad2c2360cf75741683c2a91e24a99874ff109b74cf39c2413fa876db11f8d04f155bc712f8 SHA512 7103bc91f048089f53bb28b25cad80878fdea9703e1d7e89ac0bc96aae319b76d8a5dc504a628392bbc440e30ac185fde3234a328ee25689305ae54f4eede6f7
 DIST genpatches-5.10-65.extras.tar.xz 3480 BLAKE2B 1ec5eb88df9f9ce0f6a23c4ccfc64210e27ec62faa47da6e1e21783c552c28945b275bf3450c07bb5cf3289581bb8b1e7bd5cda7afd91ffcceb1ccc554d8cc92 SHA512 8eacdd47e24028c84481fc930dc1b702435fc6997d7556352bfd109af12ed16d9b4905097e53d06f0e26d0ed1839bf5014a428701ce5078521995de9e14ec45a
+DIST genpatches-5.10-66.base.tar.xz 2062612 BLAKE2B 6aed0d13a78b49d310840e9f3d2ce17493e827c3ee5c43617b36478d02b542ca1b73ba18b8790f06df72686da9935e9596d2a3b85eb63107b998bc9765238685 SHA512 3c834cf4887f899f230db5e5a7c1f082c383726c52dda457b7fddc77e7e6e980083def63653d036a7c9bff6cfafa08abe534ef4cd8d65cc6766ef87633187df4
+DIST genpatches-5.10-66.extras.tar.xz 3476 BLAKE2B 83c469744224ee1c4e5498d30b50610f0679996262323e9e048ed14df49790fa33e704ef61c3a58fb1dc23bd13262f87cd7459a5005079eee89701fa66fab696 SHA512 985413d00a94b3e84b7be1db8ee40b6d80d7651823bf68f0a6a50fa0c46f3cbf26839d88d561aba86378d321a4628a5df90debec0e4436c01d53df074f4bd104
 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.60.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.60.ebuild
new file mode 100644
index 000000000000..660215fc8655
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.60.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[@]}"
+}