sys-kernel/vanilla-kernel: Bump to 6.1.84

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

2 files changed, 139 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index aea007380507..623281713ede 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -45,6 +45,8 @@ DIST linux-6.1.82.tar.sign 989 BLAKE2B 830f273ac8d8cf3c8c97643ff00b9a61d6a3139e2
 DIST linux-6.1.82.tar.xz 135130948 BLAKE2B 09b847ec74bc4b89c85b29df30479854b9d7479182dc3701682ca1280f46b2619f264b723cfe2278322983922045696cc21343a34ba3114f115a4d3f07e6a491 SHA512 b77ef041a504548d988d1335bb28390a8a829cd62f5d852159222de8aa14a2d8bd9cf60e06a57353ed4ef761d3d251efc65b118c78092fd6c5e4eb5f619362c8
 DIST linux-6.1.83.tar.sign 989 BLAKE2B 2f2676f4616b2e5ab0345809f514c371eeb8ec0787ab0db10b5ae981f51ea6ecc35d292a2091386bb3d3eb6eb92a196c72e16cf5adebe1651652f3f0e058cb4d SHA512 9ced015a07c0911c107e922653ebccce782419cc969d39bf892fb73126fb1e639471e6ba56fd1e86627bf4ede8e640062b2c8d65acb380ccf6bb2b871477c85b
 DIST linux-6.1.83.tar.xz 135114376 BLAKE2B 686f9eaa4ce74dad2e47aeda1eba7775d3f5caa86cfc678c11089350ffabdea743644fa51b0628ecb779cf2b67258468408953d7636a739ba0cd2e0c5bb5e8e1 SHA512 51d3b7d1dbfe0ecba1bd1265723a8e7c1553d99ade785bb91fe39979108c38f5e933b018406bfdc303a96d50eccb88d629c8dc0fecc94b975efffe8e79b43fc5
+DIST linux-6.1.84.tar.sign 989 BLAKE2B b6812c492cfbbdcfdd8960991574bbacf59445b10ed0ab2b88c24fede320a2861d290b934510f421e606a80a1a75e26d9734f151a65b5a5dc0955a18f62d829c SHA512 4b63f0fd383d55f8007596c03adcfc4d588b9add9bddca804769f785de70da955f130cf35c216b84364f596bfa5f31e9dc90455b6f457453673869368bf50637
+DIST linux-6.1.84.tar.xz 135104376 BLAKE2B 50fd2700fe6bf02dd99ddc0b8963d35d8dae43fa6f7e9226e69e2094317a7383a0bcccc20faf7b22a6736204348023a8f53c06b1b1dfaa6637446962ec36367c SHA512 7284aac84d85bdda9c1a3b743fa9904ee1435606e850e6589a4f9a4491cb3925a920feb5e02e0ff1d46ad4a68d0f95ec966c8de41caefbfae2eea3c1a2a0d025
 DIST linux-6.6.21.tar.sign 989 BLAKE2B 2a9fc1ede7eb99492243663a4664679efaca8236d3326b517a67f0ca3a595638131acef3fb5c11f9ab17d4024750e06b1e39966e75f24410fe1c8ec0ffc64105 SHA512 8f78e399019e2a026ac2a9ffa1d6c2c60b92e935547d714f2fc2143b50000059d6e0959ba71904b2c83b3b4d56737bbc69e5a3ba050ceee208b2b685454782ef
 DIST linux-6.6.21.tar.xz 140146052 BLAKE2B 7d13d5f2d5d3c00d66408f1989465067ff05cd8b317c4c81e698d3a2e7d09df7dae8605f9f6cc3614608c0ed84463d1d5e75ed602b71e435981ba78ef55326ab SHA512 e5faa4b32cb1dac14d551a40e460c3b54c021cbe184bb35b0b823539516008e5f50eedbbdb7532e17fc38f41840c397e334f6b5d990176939f13c4397cf28996
 DIST linux-6.6.22.tar.sign 989 BLAKE2B aafc276a4dbdcd5ef3767b8ce8a505adb2dbd1e65776671ceee5284eac8953ee1b74643a41eb9808e4cbc30c8deebcc0ff040703fe336b1374b09a65789ab7c1 SHA512 a57adc17182f619b576767a41c4cf964ecbaf5d88e3f61068ea86a68ed30089f046556ca02628282ce67727b3e26ada31a458167fc675f1f701e43853a6273c4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.84.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.84.ebuild
new file mode 100644
index 000000000000..af7961f3fb66
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.84.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/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=/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[@]}"
+}