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

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

commit:     cbad7d8a6875fe5f3561bcd4332c011a89086c4d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 17:03:26 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 20:52:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbad7d8a

sys-kernel/gentoo-kernel: Bump to 5.10.86

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.86.ebuild     | 119 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d9721bb53e5e..b17ad561c646 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.10-91.base.tar.xz 2708936 BLAKE2B 65251dd2fe437bf95f82ff3c3b82
 DIST genpatches-5.10-91.extras.tar.xz 3844 BLAKE2B caf397547329c9656aea77d1c68bcf73819b2f5bcd5530f728ad315eac86fceaeda88aa1d3fcfad928e7c97f2a7b148c85500574a0a52130c3289a47de140a0b SHA512 ca5fa3a15abf90931b0c6e7eefb3d1253e934d2d71162e057fa99ddfc19524335e34fdbbc83a261ea97debd5051c823aeefc02d6a308eace1b44e9c0c736447f
 DIST genpatches-5.10-92.base.tar.xz 2744152 BLAKE2B 17fb94359b2c2c137093fb7d54a6e85b3a986837f6509a40815582e5e1cfae504b3340281199020388eef0be5406b9b7cdadd6395fc418c968dbbc22093965dc SHA512 53fe7c3b446a4fac5d1d10fe17e124414506c1f5fe53d810085c3f754a44cafbb54f3da7f3fd2000470edf4a834b4433d96c6ef63785b8019533624b46a8f351
 DIST genpatches-5.10-92.extras.tar.xz 3844 BLAKE2B 0adbc9d201b5ef2f9ccca1e05bd2b4d086ceae9545526bf92a5e9704d63827b3df1f0f784155a517c989cb9fc87fa3203cf45cb5cf8212b8b30dc03a318579fb SHA512 1ac5acb0734ce0ed89c0358ba13f14abc54e63ebb20ad7a32b2ab5e7491f26a0f9efccdb9322ae35c8b4dd29e64b9a27892fe04a92938e9b439ea13028a61f79
+DIST genpatches-5.10-93.base.tar.xz 2744560 BLAKE2B 485d90002a0dbd811eae853d5fd080683a915ee064e539432edf8c763ede0af8aab994381b3d62b13039fb7d5fbbf8840c9d964dab7577066303ac1d5e6ea165 SHA512 2eff7fc0db785913a3c43cb960a136d8209a727608c91157580e3c30a26a85f72f1befa07630ce9e2a8dbb73257e0e685f560f3deb2bfd831555b92ce1e4b910
+DIST genpatches-5.10-93.extras.tar.xz 3844 BLAKE2B 679a8530673988a4c3307aa322164bc2194299e9eeb5823571234d075839ec66ef8592ebdd324c0ef999e9297eafb897b04326ea207db76277837b1a3deb303d SHA512 46a3079a340dae831183878fda86f19fd687c6861a06f1eca900ebddb6efba98d773b6869d2ab0729d449e9506f8636ada5a063aef6267bf0324a7da74eb70b7
 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-22.base.tar.xz 864000 BLAKE2B 0a2ef4aa3504d23bc2ad1047d76d705ef4fb15e15ccfc59f343bb1f817ba98940d9bcf7151cac74cb02db4e946344e43679ecfd848aca65951764ede5288ad59 SHA512 b597484d880cdcb1e8e7450c48cb5ca6a5902109182ac01725be00c264450e7e0d24e54940d3d55084383725398ee05159dc71ce7c152850a57aabbe5c26b1c7

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild
new file mode 100644
index 000000000000..44ad391debf3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild
@@ -0,0 +1,119 @@
+# 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.15.5
+
+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
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# 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
+			biendian=true
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}