Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Thu, 08 Oct 2020 15:36:22
Message-Id: 1602171370.85344cb1c041cd431392a55f0a950734b7ab2bdc.mgorny@gentoo
1 commit: 85344cb1c041cd431392a55f0a950734b7ab2bdc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 8 10:32:17 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 15:36:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85344cb1
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.70
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 1 +
13 .../vanilla-kernel/vanilla-kernel-5.4.70.ebuild | 129 +++++++++++++++++++++
14 2 files changed, 130 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 476e32be9c6..05beb9aa8d7 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -10,5 +10,6 @@ DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd2000
21 DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
22 DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
23 DIST linux-5.4.69.tar.xz 109603628 BLAKE2B 8a9b8e44b5a1ae69a4422f22b31c48ea1cf0ccf4b7fe55baa8e68b4797f717b66b38f739a5e525455ce9ecf99fdf312275a856d7f6956f17f3ffbb10a749ab63 SHA512 3a161bce688b1e9d18703f6354b746d1e8c72dcbbf6e3c8759a98ef3611234a32d7e571977aa78f33db9d42cfd9ad82145f3faea028d335a1863eb624b940b6c
24 +DIST linux-5.4.70.tar.xz 109602192 BLAKE2B 2db07e8ed76feba1dbbb697f959540ec7a050098022a460b4251802a99f71c01a76f9cbf81806cf4bd5b814a0e6b1e9f36364fcf099cf44d90780e6e0dc9ecfe SHA512 ab356476eb68ac1b2c172be97286418be307303e11ddd21e2d15cfa978a5d47b2bfec5cc61a306b48e0587e5b78cb02cec856981db9013112f4cd895374a5f21
25 DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15 SHA512 c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489
26 DIST linux-5.8.13.tar.xz 114511960 BLAKE2B 1b3510440d07032fd38beec3f325fee6cde73ba07f2fa4d0e220c3d86069a21852a9dd16cdb993a714c12eee2a3eff02f13504326f83354126f02ee399205d92 SHA512 38c5c70b4327e1f0a46bde8acac5350882aaeb1308e5e88e5d8fbc229011ea03dca76489a8413c541bedc28a446f6453e3410afa5e84cde6a57d21ec783e6f27
27
28 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
29 new file mode 100644
30 index 00000000000..ee1e12c459a
31 --- /dev/null
32 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
33 @@ -0,0 +1,129 @@
34 +# Copyright 2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +inherit kernel-build
40 +
41 +MY_P=linux-${PV}
42 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
43 +CONFIG_VER=5.4.21
44 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
45 +
46 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
47 +HOMEPAGE="https://www.kernel.org/"
48 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
49 + amd64? (
50 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
51 + -> kernel-x86_64.config.${CONFIG_VER}
52 + )
53 + arm64? (
54 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
55 + -> kernel-aarch64.config.${CONFIG_VER}
56 + )
57 + ppc64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
59 + -> kernel-ppc64le.config.${CONFIG_VER}
60 + )
61 + x86? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
63 + -> kernel-i686.config.${CONFIG_VER}
64 + )"
65 +S=${WORKDIR}/${MY_P}
66 +
67 +LICENSE="GPL-2"
68 +KEYWORDS="~amd64 ~arm64 ~x86"
69 +IUSE="debug"
70 +
71 +RDEPEND="
72 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
73 +BDEPEND="
74 + debug? ( dev-util/dwarves )"
75 +
76 +pkg_pretend() {
77 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
78 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
79 +
80 + kernel-install_pkg_pretend
81 +}
82 +
83 +src_prepare() {
84 + default
85 +
86 + # prepare the default config
87 + case ${ARCH} in
88 + amd64)
89 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
90 + ;;
91 + arm64)
92 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
93 + ;;
94 + ppc64)
95 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
96 + ;;
97 + x86)
98 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
99 + ;;
100 + *)
101 + die "Unsupported arch ${ARCH}"
102 + ;;
103 + esac
104 +
105 + local config_tweaks=(
106 + # replace (none) with gentoo
107 + -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
108 + # we do support x32
109 + -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
110 + # disable signatures
111 + -e '/CONFIG_MODULE_SIG/d'
112 + -e '/CONFIG_SECURITY_LOCKDOWN/d'
113 + -e '/CONFIG_KEXEC_SIG/d'
114 + -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
115 + -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
116 + -e '/CONFIG_SIGNATURE/d'
117 + # remove massive array of LSMs
118 + -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
119 + -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
120 + # nobody actually wants fips
121 + -e '/CONFIG_CRYPTO_FIPS/d'
122 + # these tests are really not necessary
123 + -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
124 + # probably not needed by anybody but developers
125 + -e '/CONFIG_CRYPTO_STATS/d'
126 + # 1000hz is excessive for laptops
127 + -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
128 + # nobody is using this kernel on insane super computers
129 + -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
130 + # we're not actually producing live patches for folks
131 + -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
132 + # this slows down networking in general
133 + -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
134 + # include font for normal and hidpi screens
135 + -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
136 + # we don't need to actually install system headers from this ebuild
137 + -e '/CONFIG_HEADERS_INSTALL/d'
138 + # enable /proc/config.gz, used by linux-info.eclass
139 + -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
140 + # WireGuard was backported to 5.4 but we use old configs (#739128)
141 + -e '$aCONFIG_WIREGUARD=m'
142 + )
143 + use debug || config_tweaks+=(
144 + -e '/CONFIG_DEBUG_INFO/d'
145 + -e '/CONFIG_DEBUG_RODATA_TEST/d'
146 + -e '/CONFIG_DEBUG_VM/d'
147 + -e '/CONFIG_DEBUG_SHIRQ/d'
148 + -e '/CONFIG_DEBUG_LIST/d'
149 + -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
150 + -e '/CONFIG_TORTURE_TEST/d'
151 + -e '/CONFIG_BOOTTIME_TRACING/d'
152 + -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
153 + -e '/CONFIG_X86_DECODER_SELFTEST/d'
154 + -e '/CONFIG_KGDB/d'
155 + )
156 + [[ ${ARCH} == x86 ]] && config_tweaks+=(
157 + # fix autoenabling 64bit
158 + -e '2i\
159 +# CONFIG_64BIT is not set'
160 + )
161 + sed -i "${config_tweaks[@]}" .config || die
162 +}