sys-kernel/vanilla-kernel: Bump to 5.4.60

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

2 files changed, 84 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0e35ad8ab587..5e44f6a7558e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -16,6 +16,7 @@ DIST linux-5.4.55.tar.xz 109570356 BLAKE2B 87ae06ef810727428acd8d7b823309c71b36d
 DIST linux-5.4.56.tar.xz 109571188 BLAKE2B fc5ae5a5e45f8e2582f267b0c0bceaa0e82b2cf4ce3f6823cda7968ba6984b98fed0e70232e7ad0d90b200e1b1c916d40102be62e54ecb99a15e378d1400d2dc SHA512 317bd383bc396b3867aa7ff804c20d72e27dcbbb78d02dc488528e9a25f3aaaa7a91ad1098b5a0e66d9b3290a42758c1d0631518122593aa521450977d6c62c1
 DIST linux-5.4.58.tar.xz 109570484 BLAKE2B 868296844be43f256583b84f32ca44fc3263954bf6830c9bb601c1b70f413ac52f26b82925f0a73a4cd7e6b2070ac20cd097a836603feca18aaa0bb26e8242a6 SHA512 535230c1bd718829efcc78a5f06ba803e182565838ade3628591b5fe2c5ea592ba3245583e6fecc58aef781bbab7069e632e900f0b33474442524d8472acd27b
 DIST linux-5.4.59.tar.xz 109572660 BLAKE2B b12e469150c0e09e090d60e31dfb25d83e3c2d9a0e777f49c3eac57e724bef3076cc57f64c1be6462e1c3db70a9d24d49fd19dc8f9c5f89541c868bc45715a4a SHA512 e09805b83a7f632882b3c4a7900ddb5ed78b8ad51b111387fe9428f404c09a6d01216ff93ac7d96b107a32a07ce675f21757921286ea221d4561745c743bd51d
+DIST linux-5.4.60.tar.xz 109583396 BLAKE2B 1f6296eb9be00329b1eb015eafb4a965c575ded58b8618cfc0af3d15072c424afbbc029fad4d65e0af3bccc5963c4304c14b4a9d4763cfaec9b4596834a0f9b0 SHA512 fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
 DIST linux-5.7.10.tar.xz 112722840 BLAKE2B 5b76a6b99ea0b1e38278db62951147edd2f0dcbc7c28d6fbf955beaa25344c62ee5b4d8c1c80e9e980a44d77b31dfc152b7e1d0fe0e57f5968f25b0d8a6d2dca SHA512 9568f87d593ae56dee4c7b8594f495a9c971558a3c73de8bb27336877bd5e71500ec08d880c5854e52ce338775bb9c30a98c1b9cdb789dbedba95bd3d86362ca
 DIST linux-5.7.12.tar.xz 112734632 BLAKE2B fb8f51e370f420a6f18329945addb05df3c264d06bcd7f03b6a9582ab2a13f843cd3ce99f6ce39546f882775ef473f335185ea54f38aab03e8956ae946f1e28f SHA512 8630936f2ea67fa4eaeea759f91dd71e35c294947ae6f71953ac3d99e5f93971f8c2b9e0eb18b09a35a3993e7ef648ca17160600aa07ea24f3beed44f3ed5a75
 DIST linux-5.7.13.tar.xz 112731816 BLAKE2B 8999dcaa23bf6c07e456b8fcb4b8d07a621737e72eb4f69db02b07bde0a3e73131019751d1c257434ef7380c583a914f5b81d802b82103800f6b44bde0ba4439 SHA512 60af6a81e86f7502b3ab94366107f638ac0656c4cc000d4393ab1b55dae1742cbde161b462a5de504285cd0baad22164dcac52cf38b8a0d98bfd5c638979fd71
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild
new file mode 100644
index 000000000000..d2655d6349c6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+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
+	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}
+	)
+	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 )"
+
+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_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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}