sys-kernel/vanilla-kernel: Bump to 6.1.61

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 ae533a59f3b5..77fff75b702d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,8 @@ DIST linux-6.1.59.tar.sign 989 BLAKE2B 39c2986f32d44ecb44abb3ad2142bb704bec80969
 DIST linux-6.1.59.tar.xz 134985728 BLAKE2B 8b805f75f745e6fff9d7628fb1702475ad4c94010f764d733e1c1b4d860f6e593a79ccb8aa3a8c6c0de2ffdc2c192aaa661966549a7383ceb026a59e0d949e49 SHA512 0dbaa1d4363ef0ae25bdcbbf3a330aa8a2a9383939584954653223c58b142e8074f0e25e195c522b44e150e2153b746c43c2eed5fa1309aae2839cb2446cc7a4
 DIST linux-6.1.60.tar.sign 989 BLAKE2B ac930d10be651459fe169c44b4d7a2b5f1097e907aff55e6e6c48d42aa2b5976730d21e521c8a79a0fd74cdac0be01df68527b6ec11cecbd89b79b676342f1b1 SHA512 42146c56bf8270e05c488a5829baccf403a4b088b7312478f5fcb78b0e4742a0d20867e89ff17d3479f177ddab817dee832dca4fb5eedf0d8412ae8673b782d1
 DIST linux-6.1.60.tar.xz 134984880 BLAKE2B 6d6723dd839b9003ea2a46be849e36516a97497ba3743860c8081795b372c70536465c46defd6ab4f97e81127b1bf40d78270b1a3a721a7331a935d1ef8417c4 SHA512 cef40235428a09e5f7807a8be83af9a5ab90e841049a04f9f851e69e602aeab5a50f523cae5d5928d345c11b728608eba7754b173be0c023c7ee564cfaf4b20a
+DIST linux-6.1.61.tar.sign 989 BLAKE2B 238d6292e5e59cc6b64bc53c499fca901000ac247f3ccb8be897830113564c095e79da405bbd63bf76cee9c878cde47076c508d5ae944ad115b21ded340bfc03 SHA512 2bc5b580cd1ce5dce00c5ab0695aebaf29adf774f798a4232c74c7313a4114ccd25a01a30dae2e5db04ecab3b55c7591d8d7cdbdef58a8d1ad6cb98146233f90
+DIST linux-6.1.61.tar.xz 134973932 BLAKE2B b5177aec27fb2fd0e6c846b34194c35a2435894f46ef74f282c3dd5f06b1e01c968fe50664a6e1342d0098f709a90a0d7ece0b2780f90c684889e93876cccc87 SHA512 cc4bc51abca165701ad0a5a13e2b4b0fe7f55a3ea1d0d709b714d490b1952058ed1ed3934554827b6edbaedf9609bc0e1aaa0bb238672e040ed47c34d3723b97
 DIST linux-6.5.10.tar.sign 989 BLAKE2B 01558584b85315a109e03b2b45ec18132d1d166d17ac3b01f5950bd023af1093da942446b2c8944f834c60823a1445d2b6eaaf9e14988f372ba8e1b4d6188fdd SHA512 338e66b81e859e879747333365b354034c4da5e705039fa880eda4f48644829851ce39da7477b0a4bc514f54153e5138bae0b2208f658b05a6c3c295c5af2a47
 DIST linux-6.5.10.tar.xz 138982152 BLAKE2B 6a2b93c3419edba1c8c6eddb82d6daaee64129e86575afc647e22088fe65baed2d9db43f2e606522332b1ce58e15ef16bb004b1e09cb641d9d7be15b437f71e1 SHA512 dfdc1b06c210e05060ef8235dc6eb158528d6dca51b9b55fdee94fce73f83e2fa81d5776dd4add88915ef9bb10ce986c2c9592ff1eeb744cda4e90e32b6449a1
 DIST linux-6.5.7.tar.sign 987 BLAKE2B e6cdbc33ee1f522ed3f30e144902f3a62bc10763e55047637c647445db29faa4014eefdd7beb92d700ba79d6bbbcf22b682883afbb2a1f16a6541c854c061d7d SHA512 35ef9733fd0233ba60c693f49d7b8c7d08ef9bf6eabe601ac37fbb6310ed2174813b3b4f8cb0804a1e80d276e8871b249b0fdca4f730d26b96472dbd0269b333
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild
new file mode 100644
index 000000000000..01d5d706064b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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=g10
+
+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[@]}"
+}