sys-kernel/vanilla-kernel: Bump to 5.15.85

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 faea6d791dfd..5c2d71e66ae0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.15.83.tar.sign 991 BLAKE2B 337debf039fbbcd813e4f1ae586776ef09c5d8ed
 DIST linux-5.15.83.tar.xz 126480920 BLAKE2B 37a926b2878218e95073e2820c4d1a9dc773a1715c8ef819d6b914ec672e0caed92cf9ef27405ddea083b8bfcb9de9142c269a29c0845140241de244035b0737 SHA512 61b12dcdecc96b4fff3cb2596a3da345efb8c6930ffba7ed73930e6c15b1519d8d44a4e86cf281b41c81d993f7f7ba0fe7b6513863fea298039d63cc819ef4e6
 DIST linux-5.15.84.tar.sign 991 BLAKE2B a1e14f6d1bda8288c5170436387af7bf4d35deef2da3e0af30ae025e3e3801ace99c2d52e15add896845b20e9eb8ed8098d27899fbd23a19b236eaed9cef431d SHA512 d68510da8e8da8d081ac2710d32bdd5f17d74f45e0bf7f977fcd531ed920b75d3dd0aa7bdc963509610fd3da8bdb652de6dd30c80c402318e35b43c4905040b4
 DIST linux-5.15.84.tar.xz 126464308 BLAKE2B 5e2a34ce932b67850785a3e5aa5dab783db8d084a7812aaa0d95088a405ddac2ea0b1740228dc242ed0d86f62bc7b7a3e0dccde297a0f57f482eff83e1882033 SHA512 77aba9b914936ed98f71f168384dd634f1549345c8494abb3375736ff17fef607d2da14b92a55062a295512c8ef5fe5710034006cb38afc05d5c05890baded71
+DIST linux-5.15.85.tar.sign 991 BLAKE2B dc06c346781a947993743eeb08784d35091b64c2f6d617f05e6b8eb6143887362d34a8f5e819be24cb423ee0d4e92dc040246d6f979d9ddecbf79fea439b0bf7 SHA512 c2d734b5bf0f4b5b568d5c9217bddbff319c727d3489afb8eba64f67b225d34ce8de079e2e8c4210c4096097c28cac255c9187b0267dac9b842806ce71a47220
+DIST linux-5.15.85.tar.xz 126501228 BLAKE2B 481cea334dee4146d72704ecb88f654bd38ca62a5a28540f365a57f5cd522551c4b7f854c09380ec614098a9efa5dff4cef70c9cafe6277a410d3d2099eca1cc SHA512 8cc19124c82f14e09b5ff8d2e343cd41cdfced74e5c0c501abd258555d9dbaa79e79cb23256a474cd59311ae8626b0457c2117263bd64a206151c09b54f3ff46
 DIST linux-5.4.227.tar.sign 991 BLAKE2B 35b3d286db266938ef76360d2a064141fb6e8fa73016a9ab2bf0338ab0aa8632b4c48d49af0c09ed96e25907debe4b983ba9a0166b1606c9e4fa4fd5d890221b SHA512 f615a8b8400db1bc73a36f04f0a648f419cb5681066463e9d012a3334d46db617c9f50065de8b54af8733acb86b3d9d9b83627d06b421346a415f66dcbd358cd
 DIST linux-5.4.227.tar.xz 112971772 BLAKE2B 563d25bf465859608ccdc7654a3822fcd2384b008a5c0c7a613e65456084b2c86dc9e37dcbff19eb1dd32120f0756ebf2e9c83a7e4566b01596800a1ec235856 SHA512 9af006fcba44694ea8cdda2f09687bdbc6454a1e1dfa44688296c36dbaa69afff8ee8e2bc1ea1905704dae1e971bd0214aabc5aa163979db43bf8d61085f17c1
 DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.85.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.85.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.85.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.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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[@]}"
+}