sys-kernel/vanilla-kernel: Bump to 6.6.21

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

2 files changed, 145 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index caec56c5a46f..cfbcea9005b4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -53,6 +53,8 @@ DIST linux-6.6.18.tar.sign 989 BLAKE2B f0eae28658352534ec059c50491c511f0179380b9
 DIST linux-6.6.18.tar.xz 140194352 BLAKE2B 516f2b4d1c3023265a844b632cd4246bc99ed07b69d01d9d9366ded1001170f2b41f07d199d470d24dce9519148a52943b8bbc2d9c7797f6a2716d85ca85c91d SHA512 7453d9ae753345e9312ad01da7805f68c1fb04f33aaec58ac3ba08e4b7af132c19e1822d8635fb747eb2d72cc8d89c89f3e5b7ff2e2207903cb2eb8b7dc5e884
 DIST linux-6.6.19.tar.sign 989 BLAKE2B b270f17d986588403f92b421e09bfa84684b30f3bbf10a7687409025f9106efbb843a3870df31a2f6f28214ec0da89154f43bc6423fa3477e29abb93c55d6c2f SHA512 743cea4e9e7b13034b2c842c3b3b7a7812aa1dd1e3cf91ff51ef3017e703ddf1a05cf36d6c758def318f104e7a9eaa45fe63d1f222615d52983c9cc975dffaf1
 DIST linux-6.6.19.tar.xz 140121784 BLAKE2B 348727f59393844854a0a1b4ca0a501ed605ff6785157b9a83775cbdc82d3985aee8769e25b1990118492168833b0593a7e3fbe58abeeb6436a473db5e04bf4d SHA512 b0be55d1870e0f8bc4167dd3a0b524768af90f2c5a526cd22b2f40f7e445999ef0ec3f599e6938166d14c2ceabb5c20684290a87d5e24254e73fa698ad881105
+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.7.5.tar.sign 987 BLAKE2B 7de31f0b12fb5a56d46a0c8f69520f3c35cd4f7bded310c4ffb149935b8d7f35903dc0a759d1f7bf961eb0e5a3eccc22187961efee7d4f0280d78999ef9980df SHA512 d19ffd001bd72356fc5f97838beef6bd5243ffc3e7d03bbd8011339f4a9ddacf66e9d766ad6ac4d09313d213ace89043930f62c67afdcc0179e2211db82ab36b
 DIST linux-6.7.5.tar.xz 141436804 BLAKE2B 91e5abb3905ba9e8b5cdf26b89758f4454b4e573f148fb08340c60852115d95068e44420d73373a406cb47fb011fc14ee65294489f197a3f7f39d3d8e24b2f2d SHA512 bb99e8b5f98a16e5cb0b5c22b1cff7fb1afff2ec1defea3d7c4da3889bcfd850c97ac485cb95913f85ce80146772539959515e787533c38036f92f8c7e990780
 DIST linux-6.7.6.tar.sign 987 BLAKE2B 0b124f8131f7e4e01323b6351133bc0cd5bba3c3e40d9c90bd8552d82d710f638b9bdaa5eadbbcfc6aa148128e66d94fe32a9dee87ba29e2f56c7c4056f9106e SHA512 eaa7532efc5c75db114a8f78288821c06b2abf0e70dc7219e8ed357268d88d37e511798f154e6fea0e845c7c35d20efdedb7121bbf4fb01909aa28f9fe224d9e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.21.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.21.ebuild
new file mode 100644
index 000000000000..c3a2f8b2f96a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.21.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.6.12-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 ~loong ~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
+			;;
+		loong)
+			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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}