sys-kernel/vanilla-kernel: Bump to 6.1.118

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

2 files changed, 136 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index ba14f11cdd27..4604fe5bff96 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,8 @@ DIST linux-6.1.116.tar.sign 991 BLAKE2B 57bcc0cef30c1ef19534b640edeb594705ca65ec
 DIST linux-6.1.116.tar.xz 135228552 BLAKE2B a4cf12dcfebfecd20eaff305083365fe60ee58f4798cce4648772ab7da11609751f2dcf452bbe18aac7d2d730a4f863c1126578090282389c0672c5aafabedd6 SHA512 c729c6d159cca3cc708b863cc9fa34b5c97be605d997e2ebe5ef93b33d8abecbb474e5c265756ff617dd5d23a2b73e6b36d3c73890a99963b19aa2d335515c93
 DIST linux-6.1.117.tar.sign 991 BLAKE2B 6e4317632b1d3edae3e73948f99b88af5b923862e1368495799996e8687b98d8b7d8399338b45de7b3b95b1e1c6232bce8bb05f15f8e7b49598505eb8d94011b SHA512 936b2c575f2dd44dd3024680f37bc3c0a9e5d5737084669eac8920754dfc29336a54f754003151558f5c9a7570f6e479c7f39ad3119892af1c8fb45574e4b56c
 DIST linux-6.1.117.tar.xz 135215868 BLAKE2B 968f47bcb86069d1ae348fdb2feb0024b586e4f0eb44c100d26100d4f40540741171b142dee95dc1e77d02f6ecfb54e5a02800769297bb8a501a01006436785b SHA512 8af5434ba3e981085f0b4a43313b580f956347ec79b5cf3e87eb90c5609a73041562b35416d86e6c1aa993e78a7c253c7c6ea72a03de685b70ed2a0bbb9a8f2e
+DIST linux-6.1.118.tar.sign 991 BLAKE2B 6221184420f3a933ad4dd5a58b84729639f1e8ab46778b01ad8f8f909813978cf73d4e2ae3deb6ab9ae41a117a41876cfc78d7d81047f65dafae771b9e2df9a8 SHA512 f9bd4c868544ddc086c1dca2d9331485599cf2acda22f06f5178061d2d5d342b2b03cf10aac70f0a3f43d91cf7a04681863e11a4d088986b2ba86d2f05c3118e
+DIST linux-6.1.118.tar.xz 135205608 BLAKE2B ff57e5b4450d6d358f8b28c429465abace96dd4e8f8c9bfa4b5693cebbf388eeee9b0e97afba17af98c0ef5f8d0053cd7157f26e7f560af0f2ab208d6766c2fb SHA512 f2c6f9735e551099538eae410212c10244eac765a5769d7ec4d6b8727137dad09b295a002bdd95afa3da92090374239a502ddfda09feff76c93ff69a0c7bb5ff
 DIST linux-6.11.5.tar.sign 989 BLAKE2B 03ddeca59bb70744cae46abce20dd2b7f35e299aff419476ac657722092f4e35f98bd5aa95a142928ca642a3fc7859fba5e0f70de1c2cbce8015f0df8a78d1d9 SHA512 07bd2b0ff4b3940eb274d6b9e5ab1fb17ec18a2518a336b265fcb20f36d56121a4b03dea497ea86a9009259f73d912a393c71e2641e75ddf1354c9f6862f50df
 DIST linux-6.11.5.tar.xz 146975304 BLAKE2B 8749d9f78cca3d64e97d081b3ededf506c07c7fe894253e7435afb37eb7c86b690a65293fb4b582ecd951229ca61f13679d10197e4629352262db776352b96dc SHA512 532432967a1b343408be7764be67fd47dea28f41385efb6cba93f7039bf19e75027a59c53eb3752b32863d20f334e25d8dfe68237bc5449682d18eb2b7d0ea86
 DIST linux-6.11.6.tar.sign 989 BLAKE2B c40f1cce49b802eff77556649774d4c733ff83dcdf9dd871ab32f599cda7fce8f61e813c7a3aedf35b088facdc938095d89e953642241abae7fdbde82c05d430 SHA512 7b277c22583e8664017f2144e664d7db3eb118143626a0d5d540e870cd713cd125cd77ead60234c761084751d6f7fc2fb911374e71c992b6295ff8f5bf83817e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.118.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.118.ebuild
new file mode 100644
index 000000000000..3e7046d330c0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.118.ebuild
@@ -0,0 +1,134 @@
+# 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.102-gentoo
+GENTOO_CONFIG_VER=g14
+
+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 -xf -))
+		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
+		arm | hppa)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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[@]}"
+}