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

["Michał Górny" <mgorny@gentoo.org>]

commit:     4fa450a537e04f1f979f6f66fb3b809d7a82852f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 05:14:31 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 14:13:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa450a5

sys-kernel/vanilla-kernel: Bump to 5.10.122

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d6e6ec0f661a..9eb3c250c3fd 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.10.120.tar.sign 993 BLAKE2B 885d967da77de2608bbd84d8aa8adcd87eafe98
 DIST linux-5.10.120.tar.xz 120413852 BLAKE2B 791c45c935dcf77030a0f4026b795cf29197c45676cd05ce196c7cfe62f2d53e280805cdfe454698ab027e001d409595dadd7dd9c531c222b423006f976f323d SHA512 0e7aedf0dee5131779b59ade306beeb5c383fd0dde726d32878294aceefb2bf8f80672279a3db4df8efe095413f1097c9d7ac3a9ef0aafc23a005ed14928bade
 DIST linux-5.10.121.tar.sign 993 BLAKE2B 7f9d7ce16f701c1b3762e84cce4d75c46a5418d05e6ede6664852c339a20cacde1d6bfa22509a5c14326c9061e04957a5d56bd04a9dccc4859f01cfef0bdbbaf SHA512 6ee0d85ab06dec69170d055ed07f4b5ba185f9cc60aefd00160bab6c18bc8da8b5a98d51d1f12d08fb5fa560d944e5cdf60c787236751401564af87a112dd489
 DIST linux-5.10.121.tar.xz 120419880 BLAKE2B 55956466c50a788c1c9636d70af705e253a60ffc799f489b76be86d655f088b4110e241f3ba34452ec742d5af0afebd668cce1c1b8b5e41eb807887fb817fc2b SHA512 40f23767faa745a373e79a8875540dfa4fc2bd15c246334a661190d755db5cc3f8e9d110656bcead91930b5b6fac8ca786f44637998b416ac12a16b835f0fb11
+DIST linux-5.10.122.tar.sign 993 BLAKE2B 2c851bdca13aeb75a4c36dfa7d20f61a3c7f15e48cc41c482cd77ec5079f5ddad24a8b26cc5f045e1c1d0e49a2b88cebb2057c24e855c3714821a9b42e4151d3 SHA512 7b12f8c655f6396a6903ace7b9790996d336991db11d900f44a7f08cd2c5338b87228e3d7904ee7951b99730dc9e5b7c58738ad2d5851e8b747d01cf96394dc2
+DIST linux-5.10.122.tar.xz 120427020 BLAKE2B 1e3fc0340f264fff06955ca577d1c8c955ec4b571d795d6705e09c8ae586bb0c4aa5cca80a040bb2bf128a927ac90a80d28e103d2b059d35d60a53c4fff2540c SHA512 df067fbb9dc691923e9719c3bea7b7efadd0e111b8fc58924111b59688f03f4b5538191a2447507523aa50451d59944eb492e1448f1c32e8b3674e08b33d6d22
 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
 DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974

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