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

[Michał Górny]

commit:     db4220765331661ddfc5131570517d6599235667
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:52:37 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 16:39:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db422076

sys-kernel/gentoo-kernel: Bump to 5.10.145

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index bd7d3e7edd64..fc418ce0f649 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-152.base.tar.xz 4136848 BLAKE2B d9a29db5ff2e649e3ce01112923
 DIST genpatches-5.10-152.extras.tar.xz 3868 BLAKE2B 2e24016827949d894cb2623e2a9271ec6a7af14e655cbcba65c3631fb3b8aa9ad673fdffb1a767695068537c95db722fce9dcec79d5f3f4d4d5f87a36290f017 SHA512 80180e2869f27b6515c54a7ef6411fe76eeaf777936a13648488469021681fcc01c462a0a933f9446b618632ee3c139d8e1355cda30ef2ac3befad33c79da7ab
 DIST genpatches-5.10-153.base.tar.xz 4142480 BLAKE2B 18d28cae57ea98f1ce9faf8e88aff46b4cd2ba64f98427287a0bf2323de35b050c2673a92c8f783757cda8068905cb940fb468269a624739b5222f815842dfdc SHA512 c8e5b49389eb95eb789d2d6078631feebf87571c69e0b5abffb7427db501030558186358a09b20e709d2a52ab56666285f29f5d9a8bda7a3c8c0355c38ff83a1
 DIST genpatches-5.10-153.extras.tar.xz 3868 BLAKE2B 4baa8ba350a6b0f02715d65646b00f24142e6c6be6a2270204b4e98ffbb3900b1a47bdfe741266013859b9119719c7b979e0035eb1bbfb154b39318727f56ca0 SHA512 b367c4dd3a3217d3d39a7e2f8850ed21fae2afaf508939b2da897f597f10b36a1a4375af20f07e305be0bbee89ae8787af3cc842562239af5c45430f2872cab9
+DIST genpatches-5.10-154.base.tar.xz 4154484 BLAKE2B f9db695e8f2e3feebc7a6d0ceb0971dce9fa35e440f6bfe73dff91de00d1ff8dd4687e36b04a2a3b95b12765c2b2fb93df59aad5fffd77702e2e4d2a64e6aed3 SHA512 fb138a235ccfd4bcce0912fd2dcb40a659f7dd6267725963ed839bbcb176a5721a065a0027a9366a26694472d45484b6c02b683f9a1bdf69caa980070f2b6a0e
+DIST genpatches-5.10-154.extras.tar.xz 3872 BLAKE2B fe27fd30c6ff3684f01b7ab7a2287bc3f9e0918c254b90233d3a210454daa6022eedca3823623e9d45b303b0e1f1bd3240ce75554c18dd795c82631b453c998d SHA512 97b117f143ea38226d8129fb0c508de24e06a479f0119347dc83a04b9632afac289b66102b92be84236062d2ea0f5b6b75a3f04f8bcbd3e44d98f39467882101
 DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B be108e6921f5a04605ab7c557e1ed50ce092a85eb36e6d60b4edc630457437eb89736dd992fb823522f3ca9c3ca530f3e437ad8f8b38a130bb56bc887070e1a5 SHA512 fdb5806584961dde27c7760ff4c20f6c7d08682bb998522a577dfa52a8fa021cea991c46db5efd1ab76e060e73bc38fb5728d0fae2c65f0846828c57779d6b39
 DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2 SHA512 a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d
 DIST genpatches-5.15-73.base.tar.xz 2997804 BLAKE2B 8915a7983e7766c43e7e4fb91f38ba690e60df58fb8c7d6b5f833b21df459bf5949c35e510275c793f6987e70923cdfebde739f498ca16f772920e262f391172 SHA512 3859fc75041d4c7593104e158ecf833fb0ff07aedec5143623132114308d9c877a9f2a405d83cf442f0048c046c3fa3700f51ab836de448ecf2c7b4064630c61

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.145.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.145.ebuild
new file mode 100644
index 000000000000..4824ab95a1fb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.145.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/projg2/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[@]}"
+}