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

[Michał Górny]

commit:     c53aa2d1ce53507ba4b064884070700006b5305a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 19:41:18 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 22:17:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53aa2d1

sys-kernel/gentoo-kernel: Bump to 5.10.98

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.98.ebuild     | 127 +++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 783868898bb7..0e6377b75092 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-103.base.tar.xz 2987764 BLAKE2B fab174b3219d24b39f22dc92943
 DIST genpatches-5.10-103.extras.tar.xz 3876 BLAKE2B 8f8a1ec8ccb9874660ab1a357a28bd48f622affd173c459e7014a737435c8ddaed5ea086adef4306298f3ff1779b497832804fc914c895d74b750e147d99969b SHA512 656cd727882aa8eb4b86690fbcb6c56a20de2aabd2d7de0e29ce2807b12e738a085537cd94cd37020b1d7c95469ac1566c4e2b7a3ec67ab7b88f8cf98de66a9f
 DIST genpatches-5.10-104.base.tar.xz 2993596 BLAKE2B 76aa47af46b4ab39bb19e89151c85064f5f530365196a1cf068cb055ecc26178974eaea4ca35328d1818f90c4e6d4d2b3bc2549f98b6c3f0a47071419e0d2d84 SHA512 b3fa1e616d2beccf73b1adea6f86203d1f19f4cf0492d529bf683e126d90dc74dd33abbb67bf3d86f855148aceced7d1e565475f05b19d520f45193c77dd6850
 DIST genpatches-5.10-104.extras.tar.xz 3876 BLAKE2B 6e245a2360aa73d3cf99d4439556a5057a3705e6d04d541888fdb07b648a8f0ec5d87c86cb08d85e1e7945ec086ad1ee373470271985cd4b5e85612895d1928b SHA512 643fe234bd05fa86b4161d78a6ea901623c459ae0205972fc0fa11db4c07ecc3691552c77e14cf6f02eac9c6fba16656ff40f4027411a54a6cbe205a7c0a5cc3
+DIST genpatches-5.10-105.base.tar.xz 2993776 BLAKE2B 6087b0ca5ea7150567bb23d43f83a02e653e1e1ca068e55951db43b3fbb3cb18b84fdad9c9b5ecfe77938b1192fd3260a6d241e3f840a7b09dd83449a2389ff0 SHA512 c74695b8d4b4c0205c0287840abcfa5a6e06d88cda53898e1f1a4bc67f4c264d5ca6c0c197ef5ae6d6e3627227e276865566d5dbb6a096c4bf21f569fde178a4
+DIST genpatches-5.10-105.extras.tar.xz 3872 BLAKE2B ff451545dc2cadfa871ffa39b689dc2effdecbe09a84338b82231fbc5886ac546c60cb71deeac0391d6e4a783ced9b17d56f79fb72a480e815e1ed1d6e463cc1 SHA512 b041afab67f32b35a68621f8bf34a5656f61aa3143bc75cbb4ea5df3775513afbd3adf312858b7468aee3bdb0587cbdb7eb7a9958cb590864b13ac969ecd6a2b
 DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 217af3325d15020a43cc661746272b7756aa030d7e4e66d014f68e421b83f20fd6ad16cc036cf676b3719c118d4532b174a9f7b05aad730f22a13803fd621702 SHA512 5946fa7783d48d25b4f350815e645078e1629d3678aab048de1ec5c62066180de8db940b1b0e8db2062838fc2e06820a354278c20f60ec8da71f2ea686255c58
 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39 SHA512 384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.98.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.98.ebuild
new file mode 100644
index 000000000000..2bba5adce42e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.98.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 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="~arm64"
+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
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		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[@]}"
+}