sys-kernel/vanilla-kernel: Bump to 6.1.21

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 2b10b5b87460..93b7f8673de2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -60,6 +60,8 @@ DIST linux-6.1.19.tar.sign 989 BLAKE2B 56673fda63b67cc326774c3fcd6a5e08cc1aa8138
 DIST linux-6.1.19.tar.xz 134856432 BLAKE2B 2988daff435d09babfe6e501a4b481b99206badf803c2e3510b283a42c4bb0c217e5bc479010c12c15e2d056d1dbb9d72c10f4e7fca3c9b500229e9ab90ba5d4 SHA512 06e714a70b6014a4f56b551952db899a526b9b3f7fdb11ca0f354d99e65fff1be9a3bc9522af98a93753568266233eff2f5e6f032921293ca2802587ff866ffd
 DIST linux-6.1.20.tar.sign 989 BLAKE2B e9f6715585d096e18fb091ada1ae02ed69ed6552951b6b9144c27f52dbe86dcc2db9d220955988f24b42adefc5a5426fd63ddb0b69952a44b76a5299f73722f3 SHA512 932f04db75c12149814c67eaaf5b7d9bd5c1374700522311714faaf044401975122c45d5f9ec8afd91f6876bd67c4cc401ae33247380d881c7d020d98265448d
 DIST linux-6.1.20.tar.xz 134856852 BLAKE2B 9ea5ced4b7d42537bafce8c1cc803896ccecf93971ecaff40a3606b850ea59a160284709bf10c2d1dea3c2d1a04fc81de1bad23f709542d70a24bd08604753af SHA512 1b2660fa5464410649b2d78d08cc060de4eb38bcb158154e74fee3383cae3ff4cc373235e874eceeac3abfda9689571f3b3aed8ad2ac82ec2975e21688458a9b
+DIST linux-6.1.21.tar.sign 989 BLAKE2B 74d19ef204080151bae956d3a15ace81b8186e3280bb516fe65d2dbc9f767cf1968e8bbaf1329547e5b293d9a7be1dfff431c7470391301a1fcaae534e12c0ae SHA512 1939182a371b7fcb90671f8d3e4fa0ebab2dbd6beed072b1461005d0ab147e8af73c50114b0c5c7eebc9ba388f30282fe88571fd23d78a90811612a97062d3b9
+DIST linux-6.1.21.tar.xz 134821424 BLAKE2B 4755964f4751902e8b08034752ecb4463642b971b97d2478e03226d4c26ad56353329b457587228abe05059bc88c156a5544050999bfb052b3029e57bcf82ad6 SHA512 6b49332fb3553f67adda4184e81ce8ae1acc9da0615bca82252372fed1326776540e9a853e74cc869f433406ca9c4744a4a3efa980dc2ffe1120343c40b045c5
 DIST linux-6.2.6.tar.sign 987 BLAKE2B dc30795c15693b3ebdf05418aa418e4545d95731963035dbcc837367227e882a314a72a1e5110482df2b53d3ac54626384f4f7d26b41951b69f4413d76e01c73 SHA512 dd6ba22c6ad1a6ccb64b4b7cd77ef1ce8c6c5550026bdbda636f58e88ed91dc36aa7cf1c362ec1a42bb46d82369e5dd66a7aad1e663c20577b68d69962592887
 DIST linux-6.2.6.tar.xz 136460416 BLAKE2B 6c8e064752a4c3fa16d3f8ee2cf05716e82b0154f67c198f10864174d95169c99396390094ee5b1ce661b74b7d1e749ff86796af53428006bb882ea17d7ad21b SHA512 6164e45b003c9cf17e26a35cf43b20884fc0a5886bf759639cce414b4dc2af7da7a0d39a50b41ee7844cc52fc9e75190999a06880916dbcef68af35009006877
 DIST linux-6.2.7.tar.sign 987 BLAKE2B 527bf1b3daf6b0d37f21c30a8bc4195193eb99119081ac47b1ce0973352acef64e706a9c321649929dd4e168bc553423912b4f2e41fa632bddd70290dca43fac SHA512 63822c312e085859b1890a3b8da3edbbc30fb8048d7f3283fff9e2bafb8d107ac41e3d39726df41f35c701fe83a19c622d6c22287cdfbe0a94d5d0abaaf6e008
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.21.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.21.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.21.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=g7
+
+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=${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[@]}"
+}