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

[Michał Górny]

commit:     f0ebdc4a8304176e70597c732a3a0373bfde4db3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 15:47:42 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:38:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ebdc4a

sys-kernel/gentoo-kernel: Bump to 5.10.119

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 21cbe695b05f..ad5575c3212f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fb
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
 DIST genpatches-5.10-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedbc10d20f685f1da6a93dff79e68a5c485e67d59d67ab7e5a26931ee31ea1a9f9c79b006a7c4943a6ce04951d74872387146996 SHA512 6df4bf911eebb05b2102e3f636bca18b17181efefb0891db2734ae65b87ba3b20ea63a313368aa4752cd9fa2483263b85ef8dd2438ba50ac2cbcf681b2ff203f
 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
+DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
+DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.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##*.} + 9 ))
+# 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 ~hppa ~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[@]}"
+}