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

[Michał Górny]

commit:     30e32bd2021da29975a823de12e32d851e00f40b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 12:29:49 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 15:52:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e32bd2

sys-kernel/gentoo-kernel: Bump to 5.10.109

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.109.ebuild    | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 7d551dd124d9..895f091697b6 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-115.base.tar.xz 3150232 BLAKE2B 1cfcbf4855ac4eea3331ab7696d
 DIST genpatches-5.10-115.extras.tar.xz 3872 BLAKE2B ec14f023762a3c235648ec52e895c27cd472c4a9c2304ce0519b3526aedd8ae83b98600f4b0724730d34aec02bd4e00857289007894dff282e2eaed107431359 SHA512 cacc5aafb79c02e32059fb0f820897a1c688e93aca64ac4c8c3e700dca747a052541c678dc5acb51f65bb343cb1ab9dc359109b4fcc30b08a28fd852673bd104
 DIST genpatches-5.10-116.base.tar.xz 3156432 BLAKE2B e5aeca5226e01239e656045b1aedc5fb7c98f4848ecdd742a740a17194d2c3a3676cda189f3577bd102aba2d35daaa2f6c4afa0eb943772b9cbb1c5020443ac6 SHA512 6972aa205a3d7718490ef39cc46af7277a49c5d777c8c131b85db07a23a2c4825350ad1493fc9d17a5bca85251e961c3092585c58008df2ab2094c44d9284a93
 DIST genpatches-5.10-116.extras.tar.xz 3876 BLAKE2B c36a485ce2cb9916d163be827bbfd0fa687b4d106dbddcec3b657f4740896157b4442a4d21ed195a1542ab4680894857afd3f08c6111effb32214b626d6bfba4 SHA512 a6d91a7beceb43a9f348bbea9d7c0a78daec405f1d39a98321bc34efaef4d8f6f40f1351cc6e96f08ff86203b91bd911a8ec7eb689070c835e53890510b1df2f
+DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B 0e41b33af63a5b6da920d194166e75b32812231f7b13a56211ad390d744f889dc8b024328dd2048e7c7bc356ea04936716c295cf4d33d731bbc7521b9ed720d9 SHA512 421a487bf1914ee42c8b6c39a6a99f4841e8a38e293024b4367a10391b1ca973c041697c42979b7e4a78b56b9e871034b0703f8bfa6c1347f3aef39eb49f9066
+DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782 SHA512 b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
 DIST genpatches-5.15-31.base.tar.xz 1285168 BLAKE2B 3ca09c8deeb3487fd69fe1b26ba36410c67f7c0728767999f640dd8b1655956ec4bbee2006052ded21da4f83fdba736a26610399a7580c874b1bceeda62e9564 SHA512 6330597eac5391f12fa6821d66d36fae95465fbf53d15404cca1e2496601116fbc2688fcea7e4093e00aeb241efbb1a22f4f925b5d96748004abb50ae0b21c6f
 DIST genpatches-5.15-31.extras.tar.xz 3876 BLAKE2B 47b21170f3fe46257b20f4cd63288a8f61a3600746883baa2931253d2924696e4d445404746f1a656adfa390ddf8f24780ec6688aa835467deb75dfa0d9f2fb4 SHA512 c0f866410b3436f5c45c117f1dc49e3b1d99d77d41de66ca6d08213daf6bf3eb1e8875e75e1674c3f78c7beddb6dfa2d47dc9fb75f8dfedd169f1c3478b74db1
 DIST genpatches-5.15-32.base.tar.xz 1289524 BLAKE2B 4fc3b82df9a96c5e91cfb93bc68597afa1524bc8c1a49f9a803d72610307551b9675b4e014c5ffd0b3e273b2a660546f274b27ab5425e9aa6eafd03719e5ed74 SHA512 277957056d9c8c8cc8f6a5a26582f35ae594c26e6e29b755b9214a91624eafb2917c67a612c231d8862831f4aeb34a725502c57e9063432d9597e24abf913947

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.109.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.109.ebuild
new file mode 100644
index 000000000000..ed8b3a5c0422
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.109.ebuild
@@ -0,0 +1,131 @@
+# 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##*.} + 8 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+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/${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 ~ppc ~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
+			;;
+		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[@]}"
+}