sys-kernel/vanilla-kernel: Bump to 6.10.4

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 c9718f603cc5..60f54d353b0a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-6.10.2.tar.sign 989 BLAKE2B a49737993f3a525dc2963bf11bc96b7396ea753a0
 DIST linux-6.10.2.tar.xz 145157612 BLAKE2B ab1d2e79a1bb8a9b78ab5b1af93db7ef356cb5e14bba1121bbd3ae06b9589c8bfc32bab373acdd0ecf965ac132130e7eb34e70b35a9df1bd85b49dab97e2c02a SHA512 1c121e3c9c8402ec46581b38c736630d25297dc3e981cb69d47b95e2cd3204cd93c6c15c02b81fc53d62c49ded462ab6a0bb4d94b506ec0f9c366e47a1c92606
 DIST linux-6.10.3.tar.sign 989 BLAKE2B 282a13b4d56e95df1432ea82294380dd019fe9faedd799201b6d43611b20cdaf673dfef4db77bd533106f44c4cc07eb293bc489ac7bce48f9a8da84cc47e7df0 SHA512 2fa43f6294818a12a88d6f018237c63968ded3f1dfa88be45ae0f7fb4cf456208f2027a7341bd4378cea0fec04ea0a3d80a4f8f89e7b3c1f3ecd0f0b88aff588
 DIST linux-6.10.3.tar.xz 145125004 BLAKE2B e114bbaea91d03efa318f5a85c11e28257defa5f0c8467d3a5d467a7985bdfd7c23a5f54856c85afe800c32694f382df9b147484a3aa85e1e3f4efefbd80b564 SHA512 dd6061c5871d7b313e1b0eec791444b911f9d9d5e28b1d7a81a265708688808c157adfba92459511e9b786d09e3f96f5bc3c03980360061344ad8e225e165f6a
+DIST linux-6.10.4.tar.sign 989 BLAKE2B 7a1d7c20d5d93c73eef54d54a17eb739e85d2bae6a16154c922d1bb0058bb45f46ca50532125fe3172bd15cd736c5ab1a6500f16b61cd3675e206c678e79539f SHA512 2ae08f074a16696a1162caa821a38e4290f5aa466672c036da606e84932664e11023b78d4f184686d04dc205dd7e532dd95461c6d8e9ccb52cb7734644b68f2e
+DIST linux-6.10.4.tar.xz 145115632 BLAKE2B ea7e9a7d74621a6e76b2828ee80cf5df1fcf139469bb8877d93f30d7766f9145961324de5b2cadba29126d7df82a7eeba80303c82c7c1140be3fb46cf213e503 SHA512 fb96ca6b4131152cc7b86e27f5412ca16a8a37fbb79ca04d3997164fea587e03d8659612b3ba7029591a94f957f89bec6449c54c12bb000a818ada541106638f
 DIST linux-6.6.41.tar.sign 989 BLAKE2B 91e81c3582abc1124f618d89cd68bd32b1372a3a54511b9f60159c0282fee1dd12422beb3bfe04c2d74cd0901a39dc3dda34e4f34269af2fa8d4f3603e373345 SHA512 3c1a498443999bda491832d6fe842a3ce83c65fcd9ee1fcc24beeaa273fe6dac0e0949151595ee02e04b62a904c6d0f3b1c972d41e01f58e0e2ce99bff4359cb
 DIST linux-6.6.41.tar.xz 140257040 BLAKE2B d71b2a108a600aba232d2cce9df0f8d0bd6408427be31e5185fd3dcbab36a847bc497eea6237974f76f6386d3e0dd216cd7ea3d2a9dc660bc5460042f1ab7328 SHA512 d623e13d482683c47b1e00e346658928597522b45fca94b6713e75dbd57deca92cf6b1189ddaadb7b37a04e509ff713eecc76f5a818f241e328635f77f09f504
 DIST linux-6.6.43.tar.sign 989 BLAKE2B 877809199e96598c321932c142aca616713e3b15ea9c05bc12ea9656fd38b753248b5d32325d4007b0f0dea8973a4f13e977b2caeb86b8ffe079428ac79867d4 SHA512 edd688351805d19a8527f5f7bce8065c05421dff60bbed22babc296c06fc13d570b0261d6abe1ff82b6c8d71f10d1856c44c47c6cb5d453309465d570927b40b
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.4.ebuild
new file mode 100644
index 000000000000..fe28dad4c959
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.4.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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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[@]}"
+}