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

[Michał Górny]

commit:     76acc5b39057fb42722c3d788c452c55f375cf89
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 12:17:30 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 13:42:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76acc5b3

sys-kernel/vanilla-kernel: Bump to 5.10.152

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.152.ebuild  | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 17193cebcf17..c3108d2b1f9f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.10.150.tar.sign 993 BLAKE2B 0ae037ad070f0ffb6616a2975f6d4c2f3a1146d
 DIST linux-5.10.150.tar.xz 120500048 BLAKE2B 159868086f4571b88445424dd08d2c691bd97e8842814b00ca32113c6306ede05be3ce90aa541b29e65f7df4cb3b13aebb9ec4d9a83abb490f163d8e79bdb2f6 SHA512 a671b19973977652dbcda078b1fd7d810b994c8096c0cfcdf9e5c4c4acf1ed6fa56dc64acefe96b2d7ea555480f0560e9fc80350aa4cf1afef98f9e7bbcbdccd
 DIST linux-5.10.151.tar.sign 993 BLAKE2B 5c17d3eaa8bff5da48325f4441baa22255169d3249c5521b55b5e46894f83ffc1afd2bd6a4479bc272a80dee88d0b2906dde5dae0abdb53c62649a18ef072753 SHA512 44ceff74b3bd5d209a0fb31811db1902098b07aa7b3d7845831413b4706acbb16a24b0f54f6cf074d4d8961da22a288bd61388cc4ba7e9e1468d81126b2fa04f
 DIST linux-5.10.151.tar.xz 120536380 BLAKE2B 5f331884867370d34a9be311f68c1e640733f6d672f08fc3148bba3861ea1b252be79ae287e9f8e79a4790ecf764baae469f921297a2da8ff78dc85b98bcb6c9 SHA512 c32923911ce5c17d1ef214e5996cabf590770a389f035555bd2579eac0ad60f44df18ca59f11b212bffac4d4e775d569f9cc6c4a795804c26fec21195c06dac1
+DIST linux-5.10.152.tar.sign 993 BLAKE2B 4af67d45d4f5dd206229cdd93aae79b5abfc3d3ceed2756a05623a46fe5c365304bf6d03ea05c04ead47a14148bc0d0c3d4b0ece8479e091b74a74516f6638b5 SHA512 c70466042b02b3602ce3b106085598bc957a7489b1faf46850cb45b9139a69f53a6d1d1040643bbc6c65066320fd8adb3e88ad69c8d6e000e7bf95011d227f4f
+DIST linux-5.10.152.tar.xz 120491304 BLAKE2B ee1d2d3e26aae3a8d37d4ada0be09f49f97547241529747f38f065fb50ebc08e495dc25bf9ce74b50150971ee849f0acdc59caad8849129c5d001458ad672473 SHA512 d5e09db8d446641a074e0e98d9b3f0074c97b415df9a1e8bd1cce842e810cecc50d748c0a18899e8b626934f60e587d66a74702622f4d8cb1b84084007712fed
 DIST linux-5.15.75.tar.sign 991 BLAKE2B ca3ab657a1e6d98d2f8419c98c5f41beba2cba0bcbed937c4233bf8d3222b362bd973b435bb5fc987ce9e9714dbf6ddfc2265c7ede51196d66df0234d904fe7b SHA512 81b5b73b910babb8a7b3d060c3f826f3da687fdbb8cd83fb55848238f052e035677549ea59f41636bda7dbe1ee5949e043c70e0c3d501ba1b09e5ad4e27191a3
 DIST linux-5.15.75.tar.xz 126466096 BLAKE2B cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9 SHA512 6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6
 DIST linux-5.15.76.tar.sign 991 BLAKE2B 876831fa3e2838bcc1785ba8a8231a5a50dbebe587105ea892e16f82a513383b8c920cc8c1025728a3b17d430f861b1c9671c544c5597b47a0ae226d79f1466b SHA512 4a6f18f6ac9f3ee3668778bfa1b1288f78b865fb6e39d20efb65604707ec0260db5ea4cf90b1705672853e3997e1cc8b775439b86925b7c4e5cbcf343a4bee1a

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.152.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.152.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.152.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	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 )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	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="-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[@]}"
+}