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

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

commit:     6376b7f82c148d34e507cc61aa2d0c0dd39486a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 07:06:00 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:39:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6376b7f8

sys-kernel/gentoo-kernel: Bump to 5.10.81

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.81.ebuild     | 106 +++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 61d141d0d062..178f6894c1d1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,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-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.10-88.base.tar.xz 2600948 BLAKE2B 31505fdfdf40fa4ae446a496eade8243b74dec54cacf3ed38d06e4e0d6c3088451f9b85d0a32707a609f6f233ace2544f358e24851a0cfd561800b99986d189c SHA512 d1ea1aaf5efd894fe97a937cb591680a4b74e0c3ebc0c747e6a75c813ae784825a3f50ea846f6c3e38a36c94b1d110c172697ca2e63e22ae813da140065893ce
+DIST genpatches-5.10-88.extras.tar.xz 3840 BLAKE2B d6d4ec32303320ac6b45cbb2bff67442d45a723efaacecbd7bd45df1cfeaff98683b30e06cba2f2286c24179978aa17a5de5915e8fb1af3558869274ba4caab6 SHA512 815f1ea9ed87300c81a5b4dda27314ad6a2b88505b814ef266bc8d0e72b66ab04310f05c009a9c8173401caf236c53e0bf3b7b083fdd46d8ebd82007efe0f75c
 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.81.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.81.ebuild
new file mode 100644
index 000000000000..14583071b879
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.81.ebuild
@@ -0,0 +1,106 @@
+# 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[@]}"
+}