sys-kernel/vanilla-kernel: Bump to 5.4.117

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

2 files changed, 110 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 9e3b15c18a05..6aeb6d8c469a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,3 +58,5 @@ DIST linux-5.4.115.tar.sign 991 BLAKE2B ca965dda28839e3ac3f6a582137257402de9ef3f
 DIST linux-5.4.115.tar.xz 109094472 BLAKE2B c4a8047d8297eae22e0e581f70caba430cc93cdf92a81e0cce12a787248c8d1687bbbb35c3f41808609f6b3f78d491277d9f7daf1910235439b95cd48c5c9233 SHA512 3e2dcdeadb8fb1e67116f04b00c3716686d12a99ee3e48ea3ac9fb1263a36b7b1c01aa837cf0a8409f21392b44abf64e92ed264091b3f5205b75c3b67bb30ffe
 DIST linux-5.4.116.tar.sign 991 BLAKE2B d486993e6e41394c041fa4a7cfca2351e26511858c679e2b891d5ef77717c2cd00e5e479a7ead18f4a94980fbce0ed9e5158473f48c9270f8c36f2174c70b985 SHA512 bb514720912b02e863eae5fd5d948180b18c6806aa4fd085d5520c8f20b9c81399bdf85564b6ce41736d8fdc86a7cff774ee087b2e535f394c69d8e28dd3b0bc
 DIST linux-5.4.116.tar.xz 109110668 BLAKE2B 13e8d7fb171540efd3a766a50eb332d61aab2e550a90f6837564f4f743165e79c653ed1330f017463bc335013fce5a300a7c81af16990a1cc0cca36ebafaa118 SHA512 aa6a1529b9c149a80c20e8c51fdf6d9465d787e31aeb28a57d654516d31ab4967c30cb25bcc64027bc5fba73d2518adb470511dd9f2192ba027a652bc0efb240
+DIST linux-5.4.117.tar.sign 991 BLAKE2B 01a030b5f92245c0c439ae3c4af3e0e9a8b49b055407ba1c488f3df9e1801b6a3bd153a9323bf8801d9296f9bda25255aca50b3768f468e6402f16d5953d1f9d SHA512 093c0e8502dbd3228139d82334fca5df0d408488117b2e94d2afaa02a44aa426a0032300469d73784c7cc6cd2d027e3f8cb3c7c274486907ed04b83ca75914a7
+DIST linux-5.4.117.tar.xz 109091180 BLAKE2B 09ace0bf30b3f698cdb85ac1e8d40048fc35ff00777e88a53de0bc0beb6f950288aea0d56f58ad8c3c3248396a9ea7307258247813e82a604135b4f84952ef52 SHA512 d59267ee93dba48de2690e600d90364864054dafce75887018bc265de424af652cf66afd043c8249fb0c28fec296f6a9dbab7d74736fb99feed1e28dd3ab7247
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.117.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.117.ebuild
new file mode 100644
index 000000000000..e11e956ef1fd
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.117.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+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
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}