[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

[Michał Górny]

commit:     c7bc06d0a7c0420253fa144b1e41b0b132b3b09a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 04:22:34 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 06:16:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bc06d0

sys-kernel/vanilla-kernel: Bump to 5.4.68

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

 sys-kernel/vanilla-kernel/Manifest                 |   1 +
 .../vanilla-kernel/vanilla-kernel-5.4.68.ebuild    | 129 +++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 863b1a65c08..4c9d85eafaf 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -23,6 +23,7 @@ DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd2000
 DIST linux-5.4.65.tar.xz 109587504 BLAKE2B 3cc1040e324ba0ffb95b1b075621264623a1f17b929b77af4231dfff0a494fbab2d4acbe20fcd39bc216ac21ad425ed8ff3b703b46aebf9df7009626621b8f8b SHA512 f457e7cf3f1a241a187ab8251238e0fad5308ca0f30623908ddaead32041797db02438a4a926c73b504774516db400e9c95427f4f24f60efbde65bb9e7926f0f
 DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
 DIST linux-5.4.67.tar.xz 109587704 BLAKE2B 0870c932888bbd75e04195e2a8106bf83e1df0ba99d1bab625cdd973d4c96d6ca99e8ec2d2cf9633c116c431beaa035046c4b971a9b6e50733eb64051d5f52d6 SHA512 1b1b1db72df2dc4a438ae64f1a099a5e5ca4e9aeec0d18688fdb4310cd8080b57d0c4bd718b715a5b1f608bb372079a0a49994f0cadefe68a8bc4189d5d9d658
+DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
 DIST linux-5.7.17.tar.xz 112744000 BLAKE2B ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6 SHA512 e4618e3d28882b81699892eb04b266a3e0b508806d02bd9671c84027a5a343535561b7094755ab6358ffd72e9ce5a2296b126ce9218a334b260c31535e2de59f
 DIST linux-5.7.18.tar.xz 112759392 BLAKE2B 22fb5388521bd824a8ecbde7484db3319817eaebc6c74b5f615b872ec18b1cf6abd6b9aed651400bfee2b12e2d759a066ea79412021202a05b8fa1934b9b14aa SHA512 d84a1dfb3ae6fad1f4ca3b42bbd01e9b6e1543e23f319237bc4db2381770df5a30d799cf5ed6ca85c5ece6779502327afdb4892452f612b9e4dbca3305c9901c
 DIST linux-5.7.19.tar.xz 112742648 BLAKE2B 408fdc49f8a341f6d7c0fead1ddc1b0816caf4a7393286127440a6ec1b513cd413067d6e56180310cc9d634b95c9583b7f38ae4711cd115f4ac2f08918e6b916 SHA512 c64aacd11f90dd1fb4f163ba3757ba52543c8a3c3932b9600109ad2b8ac97c8819d430067266e1e347998b5e9df92f7c0f1945a73142442ba5bccd41439a4988

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
new file mode 100644
index 00000000000..ee1e12c459a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
@@ -0,0 +1,129 @@
+# 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}
+	)
+	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 )"
+
+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
+			;;
+		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
+
+	local config_tweaks=(
+		# replace (none) with gentoo
+		-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'
+		-e '/CONFIG_KEXEC_SIG/d'
+		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+		-e '/CONFIG_SIGNATURE/d'
+		# remove massive array of LSMs
+		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+		# nobody actually wants fips
+		-e '/CONFIG_CRYPTO_FIPS/d'
+		# these tests are really not necessary
+		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+		# probably not needed by anybody but developers
+		-e '/CONFIG_CRYPTO_STATS/d'
+		# 1000hz is excessive for laptops
+		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+		# nobody is using this kernel on insane super computers
+		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+		# we're not actually producing live patches for folks
+		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+		# this slows down networking in general
+		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+		# include font for normal and hidpi screens
+		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+		# we don't need to actually install system headers from this ebuild
+		-e '/CONFIG_HEADERS_INSTALL/d'
+		# enable /proc/config.gz, used by linux-info.eclass
+		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+		# WireGuard was backported to 5.4 but we use old configs (#739128)
+		-e '$aCONFIG_WIREGUARD=m'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+		-e '/CONFIG_DEBUG_RODATA_TEST/d'
+		-e '/CONFIG_DEBUG_VM/d'
+		-e '/CONFIG_DEBUG_SHIRQ/d'
+		-e '/CONFIG_DEBUG_LIST/d'
+		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+		-e '/CONFIG_TORTURE_TEST/d'
+		-e '/CONFIG_BOOTTIME_TRACING/d'
+		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+		-e '/CONFIG_X86_DECODER_SELFTEST/d'
+		-e '/CONFIG_KGDB/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}