commit:     c464ae6ad89941f95c9cbe63b9f03939f581742e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 15:01:45 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 15:12:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c464ae6a

sys-kernel/vanilla-kernel: Bump to 5.4.69

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 86a6a797644..a53eb8422fe 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -9,4 +9,5 @@ DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a5
 DIST linux-5.4.64.tar.xz 109593152 BLAKE2B 
f0bea4ef1fac7a4744848d6328175d1cd200023eba9398bc46511e88e7ad51b559732202d642df60bb5032004e42aae753eb9d7b049781d12303f48e3aece6bc
 SHA512 
135e62581e9bef772a5c68a2b1945bbe09689d5d8bda41a09efdd7ba7cd99afa8010c4157a5d23badeb8b6f9832c53ffda49d1dd6c5862f01b9756ceca9ebcec
 DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 
5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357
 SHA512 
06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
 DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 
03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300
 SHA512 
027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
+DIST linux-5.4.69.tar.xz 109603628 BLAKE2B 
8a9b8e44b5a1ae69a4422f22b31c48ea1cf0ccf4b7fe55baa8e68b4797f717b66b38f739a5e525455ce9ecf99fdf312275a856d7f6956f17f3ffbb10a749ab63
 SHA512 
3a161bce688b1e9d18703f6354b746d1e8c72dcbbf6e3c8759a98ef3611234a32d7e571977aa78f33db9d42cfd9ad82145f3faea028d335a1863eb624b940b6c
 DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 
85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15
 SHA512 
c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
new file mode 100644
index 00000000000..ee1e12c459a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.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
+}

Reply via email to