sys-kernel/vanilla-kernel: Bump to 5.15.31

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

2 files changed, 136 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 14ccc18b3a4b..646e155c9ef1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,6 +25,8 @@ DIST linux-5.15.29.tar.sign 991 BLAKE2B 60c8d29495d8a5c30d0c7059b0311c7041da9e45
 DIST linux-5.15.29.tar.xz 126248424 BLAKE2B fe712dfbb1a3f3401f1354b8bda0fd502a0eff7333be91780201335b854ec0ea090b60a28d2167797ac705a52c5e78cd9b4c15f6b06cd2a6f87b201894948c33 SHA512 4221722a076580a6cd3526b62d8885a20c2d4de12ac3da47cabb15e5613264735982d372d04eb523b9405fe684b7de2501ac97f98c5b6f1a8f04d93bb4674ba8
 DIST linux-5.15.30.tar.sign 991 BLAKE2B 07f659fe9acf17e056eb9a2216b98f91f9bd1f3fc9ad0eddd8f261f8b804a164000edbd304931e4ae0f96818ceb6f2748701810a6139dd3e8ef7544e520699eb SHA512 caea373930c565bf6da18c258dacc2d452fe5895d7b3b6cce0e8e0f5c51072412df664c71844e666cf6f2112e45047ab9fee99cb8b65145d3c324659dc379a56
 DIST linux-5.15.30.tar.xz 126260816 BLAKE2B 1b2bec2b71e7f5fdb983207e1203a47e7246d89bf09b851433548dfdb53d231dc73c4b679c9c68d6a1e7b3f2b9a2b10ed65df790e1a7ee92881a11917d7f020c SHA512 5a49b202fee86383eb3800398295af0f49b9d4963c28df63ed3cc4dc87ae9dd0ef900f95733faf5fe2d632746a2c3533b924eecbdcb4df22aad3cb68a837e299
+DIST linux-5.15.31.tar.sign 991 BLAKE2B 578256edb4dbafe3ea74c38ff88a7454de2a003d1a6c8c09732aa66253b1f7e41d19e96b7a345d8396f2527daab3200e17334c8385ef79cd6619bec2aa4cf7f4 SHA512 5a84ab0fe5dede1370f51f4e76a79858ac9f22f32fd4355dabc7a52657ac683cb527d29e41e9d79c7bf7428334931af743beaefaa94a8b8e7ca64287f24234ba
+DIST linux-5.15.31.tar.xz 126254752 BLAKE2B 69e7da479342f76d6604ae80d1a8625c7087ccee89eb8143bf98ccbd768ffdc5857adeabf91eb316ec4aa6f8e27eef425e7968af489dabae979088dea2e78e74 SHA512 b0403d0f2ea1bea6b67530dc6340c669c8be7164f7614a24ecf44eed4f4a082251176d88385fec8d7b6461b574ac819ab7c429a61584eae07dbc4bb6f20da16e
 DIST linux-5.16.16.tar.sign 991 BLAKE2B ae5b61e2d369bb51219186795328fe72663acc73a163dc794ed3936efb8bbe7c899d79bcf42f800a3a74860a565fad65fe0e1ec534c3e938ebe18bd41c6a57e2 SHA512 52410a7e4f295d2ed72cb531af1fa5244ac0dcb8429ead99d083e5505c3abd64485e2614a31866a75e0bafd8e35dca82e78bf5ca8b329546994dcabf544673fb
 DIST linux-5.16.16.tar.xz 127585324 BLAKE2B 2dea3250907d3fb74a91f5f482417b41f634d8dcc847fde84595e3f7069323af5d396c4f737e48e7ba68c1bc7ce7049ceabca48fc429b8c672c55b185b818775 SHA512 a922b950fd3803b922be40c826554359f44f9eea8bc44be89c1db1e7173fb7726601373fdf37256eab85a644eccc774fdbcec407c7154c233117e0331f028ef8
 DIST linux-5.16.17.tar.sign 991 BLAKE2B 730b8f23a4149f716a549a003cf7ee37cbb6503d57ca48d800e63e659e079a095351a1b21edf55c0398eb059c7cc9c8af7e4bf1f314e70ff86730e691bfd137e SHA512 9eb47598cd431d0f02f59da709190455e87f309465a00fe794dd3da988d883162b7ba6636e76babe33b2ffd22d701303946e190d6ea2f02659e9355f1846b112
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.31.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.31.ebuild
new file mode 100644
index 000000000000..4152a8b521f6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.31.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.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+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 ~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[@]}"
+}