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: Wed, 28 Oct 2020 08:37:49
Message-Id: 1603874258.6adb28114ccf5640dea754fb76283a5bd3e257f1.mgorny@gentoo
1 commit: 6adb28114ccf5640dea754fb76283a5bd3e257f1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 28 08:24:20 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 28 08:37:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adb2811
7
8 sys-kernel/vanilla-kernel: Remove redundant versions
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 11 --
13 .../vanilla-kernel/vanilla-kernel-5.4.64.ebuild | 129 ---------------------
14 .../vanilla-kernel/vanilla-kernel-5.4.66.ebuild | 129 ---------------------
15 .../vanilla-kernel/vanilla-kernel-5.4.68.ebuild | 129 ---------------------
16 .../vanilla-kernel/vanilla-kernel-5.4.69.ebuild | 129 ---------------------
17 .../vanilla-kernel/vanilla-kernel-5.4.70.ebuild | 129 ---------------------
18 .../vanilla-kernel/vanilla-kernel-5.4.71.ebuild | 129 ---------------------
19 .../vanilla-kernel/vanilla-kernel-5.8.12.ebuild | 127 --------------------
20 .../vanilla-kernel/vanilla-kernel-5.8.13.ebuild | 127 --------------------
21 .../vanilla-kernel/vanilla-kernel-5.8.14.ebuild | 127 --------------------
22 .../vanilla-kernel/vanilla-kernel-5.8.15.ebuild | 127 --------------------
23 .../vanilla-kernel/vanilla-kernel-5.9.0.ebuild | 127 --------------------
24 12 files changed, 1420 deletions(-)
25
26 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
27 index 27f8220c017..64305e19506 100644
28 --- a/sys-kernel/vanilla-kernel/Manifest
29 +++ b/sys-kernel/vanilla-kernel/Manifest
30 @@ -10,17 +10,6 @@ DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556
31 DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
32 DIST kernel-x86_64-fedora.config.5.9.0 201958 BLAKE2B f210399099661f9f643b0b1fe6cfd82675fb71b4c63c8ee07645771960df2936370680e704b1494c6e66ff570a4a4dcd2c16ef521be4a29c21e1b12abbf71875 SHA512 f9c7ed7b9a8c351c841b527c352a72aeb36ed368dcf9060ff2c4c92364419cc256752d3fde76593d177cf40389a2b9dd9ac7bc05462539433d3829a429b74eca
33 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
34 -DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd200023eba9398bc46511e88e7ad51b559732202d642df60bb5032004e42aae753eb9d7b049781d12303f48e3aece6bc SHA512 135e62581e9bef772a5c68a2b1945bbe09689d5d8bda41a09efdd7ba7cd99afa8010c4157a5d23badeb8b6f9832c53ffda49d1dd6c5862f01b9756ceca9ebcec
35 -DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
36 -DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
37 -DIST linux-5.4.69.tar.xz 109603628 BLAKE2B 8a9b8e44b5a1ae69a4422f22b31c48ea1cf0ccf4b7fe55baa8e68b4797f717b66b38f739a5e525455ce9ecf99fdf312275a856d7f6956f17f3ffbb10a749ab63 SHA512 3a161bce688b1e9d18703f6354b746d1e8c72dcbbf6e3c8759a98ef3611234a32d7e571977aa78f33db9d42cfd9ad82145f3faea028d335a1863eb624b940b6c
38 -DIST linux-5.4.70.tar.xz 109602192 BLAKE2B 2db07e8ed76feba1dbbb697f959540ec7a050098022a460b4251802a99f71c01a76f9cbf81806cf4bd5b814a0e6b1e9f36364fcf099cf44d90780e6e0dc9ecfe SHA512 ab356476eb68ac1b2c172be97286418be307303e11ddd21e2d15cfa978a5d47b2bfec5cc61a306b48e0587e5b78cb02cec856981db9013112f4cd895374a5f21
39 -DIST linux-5.4.71.tar.xz 109611400 BLAKE2B 450f91dd84df37cb16c6937e2a4cc55a8b2e5046b6396685cf2ae5a733a925ed5502944b5a60a1056827c788407fa3f916e04b48b9c8e3d68df6b0830039ff0b SHA512 2b9c83425c3fd40abb76197e65933d1f79c60b71b3eccc6e0dcbb6748001ccbd002366cc2b61a796536166f08d831478a840bcb1e19ca0531b7f180a451e4d1c
40 DIST linux-5.4.72.tar.xz 109606972 BLAKE2B 90dfea3370a78742c851d7c9ee21c6fe17204f6c6825f82ebef4bf9c23bb59ae62bafc71cd4bdccad151c6042a33c43df8449d10e93f71d41bdfe3006255b5ba SHA512 6f8b191732b1f73249f8d350500ade946f61309791b3c4021deec80e4781738141afd5e4a11d071d329ec792fc87ce2e6386e151417db0fbf344b6a5659bddf7
41 -DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15 SHA512 c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489
42 -DIST linux-5.8.13.tar.xz 114511960 BLAKE2B 1b3510440d07032fd38beec3f325fee6cde73ba07f2fa4d0e220c3d86069a21852a9dd16cdb993a714c12eee2a3eff02f13504326f83354126f02ee399205d92 SHA512 38c5c70b4327e1f0a46bde8acac5350882aaeb1308e5e88e5d8fbc229011ea03dca76489a8413c541bedc28a446f6453e3410afa5e84cde6a57d21ec783e6f27
43 -DIST linux-5.8.14.tar.xz 114506716 BLAKE2B b14f2306a7e503118e67e8b854341baadafeff39b526600f6e0855ad6e11723187865bf86fc5a1b9adbfa96f9c36a212554548dd146ca6f8abdeac1e29bae08d SHA512 33300ce45c0cdd2f0b152b942662c931b53d04216bb75219e69004a7ba0b7a6781afb0d391929cdae5541628722252603199cf7ca1478d293db27b2b43afbc0a
44 -DIST linux-5.8.15.tar.xz 114506684 BLAKE2B c02aac3e4844ec3a39be76e22d57ac7ee66f3ec9d984d98dbf1bd78c431a81f75f54ed5113a583f4da5008e5e03b4b46bfd6c4030ade02b25cd16c6f1c0d8f75 SHA512 36233a6a8e20cf885aa5e6fed52d3e7ff3cf3a1b92b2a3e63255194abf3cffa8716ff025daa65712bb30186cee173c03af44a99f17e9755080fe5756b9745fc3
45 DIST linux-5.8.16.tar.xz 114513732 BLAKE2B 3f75ba3272a066c55845cf7d5e33f340d76e9b9d024b1d182be4067ba1d621bd44c78ee89bea1f7329b7e83933a23e8ed34e2eda0e415cc3a4b4e6863da2dfde SHA512 7d191257a70d2eeccd5db80ff03a8356bb5a2a5eba1f04acf2558d81fa764d18ef025315e992fe64b62b8ccdcdf4d9d9efe3b35ecf57ebc55746c976b391df0e
46 DIST linux-5.9.1.tar.xz 115502916 BLAKE2B 65eeccf077194ce03d5dbc1e8ea8f6022d709bc930945a49880fb87d71992e0614cf5ee92eb1b60fe2e3ed41fe17f0c176bbbad5f2cf0a2a349e1b08e6236558 SHA512 96af08c1dc964e5dbb3d221880ef8ca246f13370d2dc2f5ae64039f0352efc687c7446a2b4f86dad553b776ee75f78bbf58bb9bc845c9b57a9013ece63264874
47 -DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
48
49 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.64.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.64.ebuild
50 deleted file mode 100644
51 index ee1e12c459a..00000000000
52 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.64.ebuild
53 +++ /dev/null
54 @@ -1,129 +0,0 @@
55 -# Copyright 2020 Gentoo Authors
56 -# Distributed under the terms of the GNU General Public License v2
57 -
58 -EAPI=7
59 -
60 -inherit kernel-build
61 -
62 -MY_P=linux-${PV}
63 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
64 -CONFIG_VER=5.4.21
65 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
66 -
67 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
68 -HOMEPAGE="https://www.kernel.org/"
69 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
70 - amd64? (
71 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
72 - -> kernel-x86_64.config.${CONFIG_VER}
73 - )
74 - arm64? (
75 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
76 - -> kernel-aarch64.config.${CONFIG_VER}
77 - )
78 - ppc64? (
79 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
80 - -> kernel-ppc64le.config.${CONFIG_VER}
81 - )
82 - x86? (
83 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
84 - -> kernel-i686.config.${CONFIG_VER}
85 - )"
86 -S=${WORKDIR}/${MY_P}
87 -
88 -LICENSE="GPL-2"
89 -KEYWORDS="~amd64 ~arm64 ~x86"
90 -IUSE="debug"
91 -
92 -RDEPEND="
93 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
94 -BDEPEND="
95 - debug? ( dev-util/dwarves )"
96 -
97 -pkg_pretend() {
98 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
99 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
100 -
101 - kernel-install_pkg_pretend
102 -}
103 -
104 -src_prepare() {
105 - default
106 -
107 - # prepare the default config
108 - case ${ARCH} in
109 - amd64)
110 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
111 - ;;
112 - arm64)
113 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
114 - ;;
115 - ppc64)
116 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
117 - ;;
118 - x86)
119 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
120 - ;;
121 - *)
122 - die "Unsupported arch ${ARCH}"
123 - ;;
124 - esac
125 -
126 - local config_tweaks=(
127 - # replace (none) with gentoo
128 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
129 - # we do support x32
130 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
131 - # disable signatures
132 - -e '/CONFIG_MODULE_SIG/d'
133 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
134 - -e '/CONFIG_KEXEC_SIG/d'
135 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
136 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
137 - -e '/CONFIG_SIGNATURE/d'
138 - # remove massive array of LSMs
139 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
140 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
141 - # nobody actually wants fips
142 - -e '/CONFIG_CRYPTO_FIPS/d'
143 - # these tests are really not necessary
144 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
145 - # probably not needed by anybody but developers
146 - -e '/CONFIG_CRYPTO_STATS/d'
147 - # 1000hz is excessive for laptops
148 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
149 - # nobody is using this kernel on insane super computers
150 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
151 - # we're not actually producing live patches for folks
152 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
153 - # this slows down networking in general
154 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
155 - # include font for normal and hidpi screens
156 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
157 - # we don't need to actually install system headers from this ebuild
158 - -e '/CONFIG_HEADERS_INSTALL/d'
159 - # enable /proc/config.gz, used by linux-info.eclass
160 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
161 - # WireGuard was backported to 5.4 but we use old configs (#739128)
162 - -e '$aCONFIG_WIREGUARD=m'
163 - )
164 - use debug || config_tweaks+=(
165 - -e '/CONFIG_DEBUG_INFO/d'
166 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
167 - -e '/CONFIG_DEBUG_VM/d'
168 - -e '/CONFIG_DEBUG_SHIRQ/d'
169 - -e '/CONFIG_DEBUG_LIST/d'
170 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
171 - -e '/CONFIG_TORTURE_TEST/d'
172 - -e '/CONFIG_BOOTTIME_TRACING/d'
173 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
174 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
175 - -e '/CONFIG_KGDB/d'
176 - )
177 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
178 - # fix autoenabling 64bit
179 - -e '2i\
180 -# CONFIG_64BIT is not set'
181 - )
182 - sed -i "${config_tweaks[@]}" .config || die
183 -}
184
185 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.66.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.66.ebuild
186 deleted file mode 100644
187 index ee1e12c459a..00000000000
188 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.66.ebuild
189 +++ /dev/null
190 @@ -1,129 +0,0 @@
191 -# Copyright 2020 Gentoo Authors
192 -# Distributed under the terms of the GNU General Public License v2
193 -
194 -EAPI=7
195 -
196 -inherit kernel-build
197 -
198 -MY_P=linux-${PV}
199 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
200 -CONFIG_VER=5.4.21
201 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
202 -
203 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
204 -HOMEPAGE="https://www.kernel.org/"
205 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
206 - amd64? (
207 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
208 - -> kernel-x86_64.config.${CONFIG_VER}
209 - )
210 - arm64? (
211 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
212 - -> kernel-aarch64.config.${CONFIG_VER}
213 - )
214 - ppc64? (
215 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
216 - -> kernel-ppc64le.config.${CONFIG_VER}
217 - )
218 - x86? (
219 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
220 - -> kernel-i686.config.${CONFIG_VER}
221 - )"
222 -S=${WORKDIR}/${MY_P}
223 -
224 -LICENSE="GPL-2"
225 -KEYWORDS="~amd64 ~arm64 ~x86"
226 -IUSE="debug"
227 -
228 -RDEPEND="
229 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
230 -BDEPEND="
231 - debug? ( dev-util/dwarves )"
232 -
233 -pkg_pretend() {
234 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
235 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
236 -
237 - kernel-install_pkg_pretend
238 -}
239 -
240 -src_prepare() {
241 - default
242 -
243 - # prepare the default config
244 - case ${ARCH} in
245 - amd64)
246 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
247 - ;;
248 - arm64)
249 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
250 - ;;
251 - ppc64)
252 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
253 - ;;
254 - x86)
255 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
256 - ;;
257 - *)
258 - die "Unsupported arch ${ARCH}"
259 - ;;
260 - esac
261 -
262 - local config_tweaks=(
263 - # replace (none) with gentoo
264 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
265 - # we do support x32
266 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
267 - # disable signatures
268 - -e '/CONFIG_MODULE_SIG/d'
269 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
270 - -e '/CONFIG_KEXEC_SIG/d'
271 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
272 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
273 - -e '/CONFIG_SIGNATURE/d'
274 - # remove massive array of LSMs
275 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
276 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
277 - # nobody actually wants fips
278 - -e '/CONFIG_CRYPTO_FIPS/d'
279 - # these tests are really not necessary
280 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
281 - # probably not needed by anybody but developers
282 - -e '/CONFIG_CRYPTO_STATS/d'
283 - # 1000hz is excessive for laptops
284 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
285 - # nobody is using this kernel on insane super computers
286 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
287 - # we're not actually producing live patches for folks
288 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
289 - # this slows down networking in general
290 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
291 - # include font for normal and hidpi screens
292 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
293 - # we don't need to actually install system headers from this ebuild
294 - -e '/CONFIG_HEADERS_INSTALL/d'
295 - # enable /proc/config.gz, used by linux-info.eclass
296 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
297 - # WireGuard was backported to 5.4 but we use old configs (#739128)
298 - -e '$aCONFIG_WIREGUARD=m'
299 - )
300 - use debug || config_tweaks+=(
301 - -e '/CONFIG_DEBUG_INFO/d'
302 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
303 - -e '/CONFIG_DEBUG_VM/d'
304 - -e '/CONFIG_DEBUG_SHIRQ/d'
305 - -e '/CONFIG_DEBUG_LIST/d'
306 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
307 - -e '/CONFIG_TORTURE_TEST/d'
308 - -e '/CONFIG_BOOTTIME_TRACING/d'
309 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
310 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
311 - -e '/CONFIG_KGDB/d'
312 - )
313 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
314 - # fix autoenabling 64bit
315 - -e '2i\
316 -# CONFIG_64BIT is not set'
317 - )
318 - sed -i "${config_tweaks[@]}" .config || die
319 -}
320
321 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
322 deleted file mode 100644
323 index ee1e12c459a..00000000000
324 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
325 +++ /dev/null
326 @@ -1,129 +0,0 @@
327 -# Copyright 2020 Gentoo Authors
328 -# Distributed under the terms of the GNU General Public License v2
329 -
330 -EAPI=7
331 -
332 -inherit kernel-build
333 -
334 -MY_P=linux-${PV}
335 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
336 -CONFIG_VER=5.4.21
337 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
338 -
339 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
340 -HOMEPAGE="https://www.kernel.org/"
341 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
342 - amd64? (
343 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
344 - -> kernel-x86_64.config.${CONFIG_VER}
345 - )
346 - arm64? (
347 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
348 - -> kernel-aarch64.config.${CONFIG_VER}
349 - )
350 - ppc64? (
351 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
352 - -> kernel-ppc64le.config.${CONFIG_VER}
353 - )
354 - x86? (
355 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
356 - -> kernel-i686.config.${CONFIG_VER}
357 - )"
358 -S=${WORKDIR}/${MY_P}
359 -
360 -LICENSE="GPL-2"
361 -KEYWORDS="~amd64 ~arm64 ~x86"
362 -IUSE="debug"
363 -
364 -RDEPEND="
365 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
366 -BDEPEND="
367 - debug? ( dev-util/dwarves )"
368 -
369 -pkg_pretend() {
370 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
371 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
372 -
373 - kernel-install_pkg_pretend
374 -}
375 -
376 -src_prepare() {
377 - default
378 -
379 - # prepare the default config
380 - case ${ARCH} in
381 - amd64)
382 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
383 - ;;
384 - arm64)
385 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
386 - ;;
387 - ppc64)
388 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
389 - ;;
390 - x86)
391 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
392 - ;;
393 - *)
394 - die "Unsupported arch ${ARCH}"
395 - ;;
396 - esac
397 -
398 - local config_tweaks=(
399 - # replace (none) with gentoo
400 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
401 - # we do support x32
402 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
403 - # disable signatures
404 - -e '/CONFIG_MODULE_SIG/d'
405 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
406 - -e '/CONFIG_KEXEC_SIG/d'
407 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
408 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
409 - -e '/CONFIG_SIGNATURE/d'
410 - # remove massive array of LSMs
411 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
412 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
413 - # nobody actually wants fips
414 - -e '/CONFIG_CRYPTO_FIPS/d'
415 - # these tests are really not necessary
416 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
417 - # probably not needed by anybody but developers
418 - -e '/CONFIG_CRYPTO_STATS/d'
419 - # 1000hz is excessive for laptops
420 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
421 - # nobody is using this kernel on insane super computers
422 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
423 - # we're not actually producing live patches for folks
424 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
425 - # this slows down networking in general
426 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
427 - # include font for normal and hidpi screens
428 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
429 - # we don't need to actually install system headers from this ebuild
430 - -e '/CONFIG_HEADERS_INSTALL/d'
431 - # enable /proc/config.gz, used by linux-info.eclass
432 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
433 - # WireGuard was backported to 5.4 but we use old configs (#739128)
434 - -e '$aCONFIG_WIREGUARD=m'
435 - )
436 - use debug || config_tweaks+=(
437 - -e '/CONFIG_DEBUG_INFO/d'
438 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
439 - -e '/CONFIG_DEBUG_VM/d'
440 - -e '/CONFIG_DEBUG_SHIRQ/d'
441 - -e '/CONFIG_DEBUG_LIST/d'
442 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
443 - -e '/CONFIG_TORTURE_TEST/d'
444 - -e '/CONFIG_BOOTTIME_TRACING/d'
445 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
446 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
447 - -e '/CONFIG_KGDB/d'
448 - )
449 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
450 - # fix autoenabling 64bit
451 - -e '2i\
452 -# CONFIG_64BIT is not set'
453 - )
454 - sed -i "${config_tweaks[@]}" .config || die
455 -}
456
457 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
458 deleted file mode 100644
459 index ee1e12c459a..00000000000
460 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
461 +++ /dev/null
462 @@ -1,129 +0,0 @@
463 -# Copyright 2020 Gentoo Authors
464 -# Distributed under the terms of the GNU General Public License v2
465 -
466 -EAPI=7
467 -
468 -inherit kernel-build
469 -
470 -MY_P=linux-${PV}
471 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
472 -CONFIG_VER=5.4.21
473 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
474 -
475 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
476 -HOMEPAGE="https://www.kernel.org/"
477 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
478 - amd64? (
479 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
480 - -> kernel-x86_64.config.${CONFIG_VER}
481 - )
482 - arm64? (
483 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
484 - -> kernel-aarch64.config.${CONFIG_VER}
485 - )
486 - ppc64? (
487 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
488 - -> kernel-ppc64le.config.${CONFIG_VER}
489 - )
490 - x86? (
491 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
492 - -> kernel-i686.config.${CONFIG_VER}
493 - )"
494 -S=${WORKDIR}/${MY_P}
495 -
496 -LICENSE="GPL-2"
497 -KEYWORDS="~amd64 ~arm64 ~x86"
498 -IUSE="debug"
499 -
500 -RDEPEND="
501 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
502 -BDEPEND="
503 - debug? ( dev-util/dwarves )"
504 -
505 -pkg_pretend() {
506 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
507 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
508 -
509 - kernel-install_pkg_pretend
510 -}
511 -
512 -src_prepare() {
513 - default
514 -
515 - # prepare the default config
516 - case ${ARCH} in
517 - amd64)
518 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
519 - ;;
520 - arm64)
521 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
522 - ;;
523 - ppc64)
524 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
525 - ;;
526 - x86)
527 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
528 - ;;
529 - *)
530 - die "Unsupported arch ${ARCH}"
531 - ;;
532 - esac
533 -
534 - local config_tweaks=(
535 - # replace (none) with gentoo
536 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
537 - # we do support x32
538 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
539 - # disable signatures
540 - -e '/CONFIG_MODULE_SIG/d'
541 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
542 - -e '/CONFIG_KEXEC_SIG/d'
543 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
544 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
545 - -e '/CONFIG_SIGNATURE/d'
546 - # remove massive array of LSMs
547 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
548 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
549 - # nobody actually wants fips
550 - -e '/CONFIG_CRYPTO_FIPS/d'
551 - # these tests are really not necessary
552 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
553 - # probably not needed by anybody but developers
554 - -e '/CONFIG_CRYPTO_STATS/d'
555 - # 1000hz is excessive for laptops
556 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
557 - # nobody is using this kernel on insane super computers
558 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
559 - # we're not actually producing live patches for folks
560 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
561 - # this slows down networking in general
562 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
563 - # include font for normal and hidpi screens
564 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
565 - # we don't need to actually install system headers from this ebuild
566 - -e '/CONFIG_HEADERS_INSTALL/d'
567 - # enable /proc/config.gz, used by linux-info.eclass
568 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
569 - # WireGuard was backported to 5.4 but we use old configs (#739128)
570 - -e '$aCONFIG_WIREGUARD=m'
571 - )
572 - use debug || config_tweaks+=(
573 - -e '/CONFIG_DEBUG_INFO/d'
574 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
575 - -e '/CONFIG_DEBUG_VM/d'
576 - -e '/CONFIG_DEBUG_SHIRQ/d'
577 - -e '/CONFIG_DEBUG_LIST/d'
578 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
579 - -e '/CONFIG_TORTURE_TEST/d'
580 - -e '/CONFIG_BOOTTIME_TRACING/d'
581 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
582 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
583 - -e '/CONFIG_KGDB/d'
584 - )
585 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
586 - # fix autoenabling 64bit
587 - -e '2i\
588 -# CONFIG_64BIT is not set'
589 - )
590 - sed -i "${config_tweaks[@]}" .config || die
591 -}
592
593 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
594 deleted file mode 100644
595 index ee1e12c459a..00000000000
596 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
597 +++ /dev/null
598 @@ -1,129 +0,0 @@
599 -# Copyright 2020 Gentoo Authors
600 -# Distributed under the terms of the GNU General Public License v2
601 -
602 -EAPI=7
603 -
604 -inherit kernel-build
605 -
606 -MY_P=linux-${PV}
607 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
608 -CONFIG_VER=5.4.21
609 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
610 -
611 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
612 -HOMEPAGE="https://www.kernel.org/"
613 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
614 - amd64? (
615 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
616 - -> kernel-x86_64.config.${CONFIG_VER}
617 - )
618 - arm64? (
619 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
620 - -> kernel-aarch64.config.${CONFIG_VER}
621 - )
622 - ppc64? (
623 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
624 - -> kernel-ppc64le.config.${CONFIG_VER}
625 - )
626 - x86? (
627 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
628 - -> kernel-i686.config.${CONFIG_VER}
629 - )"
630 -S=${WORKDIR}/${MY_P}
631 -
632 -LICENSE="GPL-2"
633 -KEYWORDS="~amd64 ~arm64 ~x86"
634 -IUSE="debug"
635 -
636 -RDEPEND="
637 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
638 -BDEPEND="
639 - debug? ( dev-util/dwarves )"
640 -
641 -pkg_pretend() {
642 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
643 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
644 -
645 - kernel-install_pkg_pretend
646 -}
647 -
648 -src_prepare() {
649 - default
650 -
651 - # prepare the default config
652 - case ${ARCH} in
653 - amd64)
654 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
655 - ;;
656 - arm64)
657 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
658 - ;;
659 - ppc64)
660 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
661 - ;;
662 - x86)
663 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
664 - ;;
665 - *)
666 - die "Unsupported arch ${ARCH}"
667 - ;;
668 - esac
669 -
670 - local config_tweaks=(
671 - # replace (none) with gentoo
672 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
673 - # we do support x32
674 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
675 - # disable signatures
676 - -e '/CONFIG_MODULE_SIG/d'
677 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
678 - -e '/CONFIG_KEXEC_SIG/d'
679 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
680 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
681 - -e '/CONFIG_SIGNATURE/d'
682 - # remove massive array of LSMs
683 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
684 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
685 - # nobody actually wants fips
686 - -e '/CONFIG_CRYPTO_FIPS/d'
687 - # these tests are really not necessary
688 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
689 - # probably not needed by anybody but developers
690 - -e '/CONFIG_CRYPTO_STATS/d'
691 - # 1000hz is excessive for laptops
692 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
693 - # nobody is using this kernel on insane super computers
694 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
695 - # we're not actually producing live patches for folks
696 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
697 - # this slows down networking in general
698 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
699 - # include font for normal and hidpi screens
700 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
701 - # we don't need to actually install system headers from this ebuild
702 - -e '/CONFIG_HEADERS_INSTALL/d'
703 - # enable /proc/config.gz, used by linux-info.eclass
704 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
705 - # WireGuard was backported to 5.4 but we use old configs (#739128)
706 - -e '$aCONFIG_WIREGUARD=m'
707 - )
708 - use debug || config_tweaks+=(
709 - -e '/CONFIG_DEBUG_INFO/d'
710 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
711 - -e '/CONFIG_DEBUG_VM/d'
712 - -e '/CONFIG_DEBUG_SHIRQ/d'
713 - -e '/CONFIG_DEBUG_LIST/d'
714 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
715 - -e '/CONFIG_TORTURE_TEST/d'
716 - -e '/CONFIG_BOOTTIME_TRACING/d'
717 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
718 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
719 - -e '/CONFIG_KGDB/d'
720 - )
721 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
722 - # fix autoenabling 64bit
723 - -e '2i\
724 -# CONFIG_64BIT is not set'
725 - )
726 - sed -i "${config_tweaks[@]}" .config || die
727 -}
728
729 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.71.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.71.ebuild
730 deleted file mode 100644
731 index ee1e12c459a..00000000000
732 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.71.ebuild
733 +++ /dev/null
734 @@ -1,129 +0,0 @@
735 -# Copyright 2020 Gentoo Authors
736 -# Distributed under the terms of the GNU General Public License v2
737 -
738 -EAPI=7
739 -
740 -inherit kernel-build
741 -
742 -MY_P=linux-${PV}
743 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
744 -CONFIG_VER=5.4.21
745 -CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
746 -
747 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
748 -HOMEPAGE="https://www.kernel.org/"
749 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
750 - amd64? (
751 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
752 - -> kernel-x86_64.config.${CONFIG_VER}
753 - )
754 - arm64? (
755 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
756 - -> kernel-aarch64.config.${CONFIG_VER}
757 - )
758 - ppc64? (
759 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
760 - -> kernel-ppc64le.config.${CONFIG_VER}
761 - )
762 - x86? (
763 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
764 - -> kernel-i686.config.${CONFIG_VER}
765 - )"
766 -S=${WORKDIR}/${MY_P}
767 -
768 -LICENSE="GPL-2"
769 -KEYWORDS="~amd64 ~arm64 ~x86"
770 -IUSE="debug"
771 -
772 -RDEPEND="
773 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
774 -BDEPEND="
775 - debug? ( dev-util/dwarves )"
776 -
777 -pkg_pretend() {
778 - ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
779 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
780 -
781 - kernel-install_pkg_pretend
782 -}
783 -
784 -src_prepare() {
785 - default
786 -
787 - # prepare the default config
788 - case ${ARCH} in
789 - amd64)
790 - cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
791 - ;;
792 - arm64)
793 - cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
794 - ;;
795 - ppc64)
796 - cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
797 - ;;
798 - x86)
799 - cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
800 - ;;
801 - *)
802 - die "Unsupported arch ${ARCH}"
803 - ;;
804 - esac
805 -
806 - local config_tweaks=(
807 - # replace (none) with gentoo
808 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
809 - # we do support x32
810 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
811 - # disable signatures
812 - -e '/CONFIG_MODULE_SIG/d'
813 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
814 - -e '/CONFIG_KEXEC_SIG/d'
815 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
816 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
817 - -e '/CONFIG_SIGNATURE/d'
818 - # remove massive array of LSMs
819 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
820 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
821 - # nobody actually wants fips
822 - -e '/CONFIG_CRYPTO_FIPS/d'
823 - # these tests are really not necessary
824 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
825 - # probably not needed by anybody but developers
826 - -e '/CONFIG_CRYPTO_STATS/d'
827 - # 1000hz is excessive for laptops
828 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
829 - # nobody is using this kernel on insane super computers
830 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
831 - # we're not actually producing live patches for folks
832 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
833 - # this slows down networking in general
834 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
835 - # include font for normal and hidpi screens
836 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
837 - # we don't need to actually install system headers from this ebuild
838 - -e '/CONFIG_HEADERS_INSTALL/d'
839 - # enable /proc/config.gz, used by linux-info.eclass
840 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
841 - # WireGuard was backported to 5.4 but we use old configs (#739128)
842 - -e '$aCONFIG_WIREGUARD=m'
843 - )
844 - use debug || config_tweaks+=(
845 - -e '/CONFIG_DEBUG_INFO/d'
846 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
847 - -e '/CONFIG_DEBUG_VM/d'
848 - -e '/CONFIG_DEBUG_SHIRQ/d'
849 - -e '/CONFIG_DEBUG_LIST/d'
850 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
851 - -e '/CONFIG_TORTURE_TEST/d'
852 - -e '/CONFIG_BOOTTIME_TRACING/d'
853 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
854 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
855 - -e '/CONFIG_KGDB/d'
856 - )
857 - [[ ${ARCH} == x86 ]] && config_tweaks+=(
858 - # fix autoenabling 64bit
859 - -e '2i\
860 -# CONFIG_64BIT is not set'
861 - )
862 - sed -i "${config_tweaks[@]}" .config || die
863 -}
864
865 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild
866 deleted file mode 100644
867 index 540a5ea3c74..00000000000
868 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild
869 +++ /dev/null
870 @@ -1,127 +0,0 @@
871 -# Copyright 2020 Gentoo Authors
872 -# Distributed under the terms of the GNU General Public License v2
873 -
874 -EAPI=7
875 -
876 -inherit kernel-build
877 -
878 -MY_P=linux-${PV}
879 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
880 -CONFIG_VER=5.8.5
881 -CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
882 -
883 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
884 -HOMEPAGE="https://www.kernel.org/"
885 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
886 - amd64? (
887 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
888 - -> kernel-x86_64-fedora.config.${CONFIG_VER}
889 - )
890 - arm64? (
891 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
892 - -> kernel-aarch64-fedora.config.${CONFIG_VER}
893 - )
894 - ppc64? (
895 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
896 - -> kernel-ppc64le-fedora.config.${CONFIG_VER}
897 - )
898 - x86? (
899 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
900 - -> kernel-i686-fedora.config.${CONFIG_VER}
901 - )"
902 -S=${WORKDIR}/${MY_P}
903 -
904 -LICENSE="GPL-2"
905 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
906 -IUSE="debug"
907 -REQUIRED_USE="
908 - arm? ( savedconfig )"
909 -
910 -RDEPEND="
911 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
912 -BDEPEND="
913 - debug? ( dev-util/dwarves )"
914 -
915 -pkg_pretend() {
916 - ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
917 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
918 -
919 - kernel-install_pkg_pretend
920 -}
921 -
922 -src_prepare() {
923 - default
924 -
925 - # prepare the default config
926 - case ${ARCH} in
927 - amd64)
928 - cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
929 - ;;
930 - arm)
931 - return
932 - ;;
933 - arm64)
934 - cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
935 - ;;
936 - ppc64)
937 - cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
938 - ;;
939 - x86)
940 - cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
941 - ;;
942 - *)
943 - die "Unsupported arch ${ARCH}"
944 - ;;
945 - esac
946 -
947 - local config_tweaks=(
948 - # replace (none) with gentoo
949 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
950 - # we do support x32
951 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
952 - # disable signatures
953 - -e '/CONFIG_MODULE_SIG/d'
954 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
955 - -e '/CONFIG_KEXEC_SIG/d'
956 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
957 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
958 - -e '/CONFIG_SIGNATURE/d'
959 - # remove massive array of LSMs
960 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
961 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
962 - # nobody actually wants fips
963 - -e '/CONFIG_CRYPTO_FIPS/d'
964 - # these tests are really not necessary
965 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
966 - # probably not needed by anybody but developers
967 - -e '/CONFIG_CRYPTO_STATS/d'
968 - # 1000hz is excessive for laptops
969 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
970 - # nobody is using this kernel on insane super computers
971 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
972 - # we're not actually producing live patches for folks
973 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
974 - # this slows down networking in general
975 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
976 - # include font for normal and hidpi screens
977 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
978 - # we don't need to actually install system headers from this ebuild
979 - -e '/CONFIG_HEADERS_INSTALL/d'
980 - # enable /proc/config.gz, used by linux-info.eclass
981 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
982 - )
983 - use debug || config_tweaks+=(
984 - -e '/CONFIG_DEBUG_INFO/d'
985 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
986 - -e '/CONFIG_DEBUG_VM/d'
987 - -e '/CONFIG_DEBUG_SHIRQ/d'
988 - -e '/CONFIG_DEBUG_LIST/d'
989 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
990 - -e '/CONFIG_TORTURE_TEST/d'
991 - -e '/CONFIG_BOOTTIME_TRACING/d'
992 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
993 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
994 - -e '/CONFIG_KGDB/d'
995 - )
996 - sed -i "${config_tweaks[@]}" .config || die
997 -}
998
999 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild
1000 deleted file mode 100644
1001 index 540a5ea3c74..00000000000
1002 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild
1003 +++ /dev/null
1004 @@ -1,127 +0,0 @@
1005 -# Copyright 2020 Gentoo Authors
1006 -# Distributed under the terms of the GNU General Public License v2
1007 -
1008 -EAPI=7
1009 -
1010 -inherit kernel-build
1011 -
1012 -MY_P=linux-${PV}
1013 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
1014 -CONFIG_VER=5.8.5
1015 -CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
1016 -
1017 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
1018 -HOMEPAGE="https://www.kernel.org/"
1019 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
1020 - amd64? (
1021 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
1022 - -> kernel-x86_64-fedora.config.${CONFIG_VER}
1023 - )
1024 - arm64? (
1025 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
1026 - -> kernel-aarch64-fedora.config.${CONFIG_VER}
1027 - )
1028 - ppc64? (
1029 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
1030 - -> kernel-ppc64le-fedora.config.${CONFIG_VER}
1031 - )
1032 - x86? (
1033 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
1034 - -> kernel-i686-fedora.config.${CONFIG_VER}
1035 - )"
1036 -S=${WORKDIR}/${MY_P}
1037 -
1038 -LICENSE="GPL-2"
1039 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
1040 -IUSE="debug"
1041 -REQUIRED_USE="
1042 - arm? ( savedconfig )"
1043 -
1044 -RDEPEND="
1045 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
1046 -BDEPEND="
1047 - debug? ( dev-util/dwarves )"
1048 -
1049 -pkg_pretend() {
1050 - ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
1051 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
1052 -
1053 - kernel-install_pkg_pretend
1054 -}
1055 -
1056 -src_prepare() {
1057 - default
1058 -
1059 - # prepare the default config
1060 - case ${ARCH} in
1061 - amd64)
1062 - cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
1063 - ;;
1064 - arm)
1065 - return
1066 - ;;
1067 - arm64)
1068 - cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
1069 - ;;
1070 - ppc64)
1071 - cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
1072 - ;;
1073 - x86)
1074 - cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
1075 - ;;
1076 - *)
1077 - die "Unsupported arch ${ARCH}"
1078 - ;;
1079 - esac
1080 -
1081 - local config_tweaks=(
1082 - # replace (none) with gentoo
1083 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
1084 - # we do support x32
1085 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
1086 - # disable signatures
1087 - -e '/CONFIG_MODULE_SIG/d'
1088 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
1089 - -e '/CONFIG_KEXEC_SIG/d'
1090 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
1091 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
1092 - -e '/CONFIG_SIGNATURE/d'
1093 - # remove massive array of LSMs
1094 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
1095 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
1096 - # nobody actually wants fips
1097 - -e '/CONFIG_CRYPTO_FIPS/d'
1098 - # these tests are really not necessary
1099 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
1100 - # probably not needed by anybody but developers
1101 - -e '/CONFIG_CRYPTO_STATS/d'
1102 - # 1000hz is excessive for laptops
1103 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
1104 - # nobody is using this kernel on insane super computers
1105 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
1106 - # we're not actually producing live patches for folks
1107 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
1108 - # this slows down networking in general
1109 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
1110 - # include font for normal and hidpi screens
1111 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
1112 - # we don't need to actually install system headers from this ebuild
1113 - -e '/CONFIG_HEADERS_INSTALL/d'
1114 - # enable /proc/config.gz, used by linux-info.eclass
1115 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
1116 - )
1117 - use debug || config_tweaks+=(
1118 - -e '/CONFIG_DEBUG_INFO/d'
1119 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
1120 - -e '/CONFIG_DEBUG_VM/d'
1121 - -e '/CONFIG_DEBUG_SHIRQ/d'
1122 - -e '/CONFIG_DEBUG_LIST/d'
1123 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
1124 - -e '/CONFIG_TORTURE_TEST/d'
1125 - -e '/CONFIG_BOOTTIME_TRACING/d'
1126 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
1127 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
1128 - -e '/CONFIG_KGDB/d'
1129 - )
1130 - sed -i "${config_tweaks[@]}" .config || die
1131 -}
1132
1133 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild
1134 deleted file mode 100644
1135 index 540a5ea3c74..00000000000
1136 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild
1137 +++ /dev/null
1138 @@ -1,127 +0,0 @@
1139 -# Copyright 2020 Gentoo Authors
1140 -# Distributed under the terms of the GNU General Public License v2
1141 -
1142 -EAPI=7
1143 -
1144 -inherit kernel-build
1145 -
1146 -MY_P=linux-${PV}
1147 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
1148 -CONFIG_VER=5.8.5
1149 -CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
1150 -
1151 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
1152 -HOMEPAGE="https://www.kernel.org/"
1153 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
1154 - amd64? (
1155 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
1156 - -> kernel-x86_64-fedora.config.${CONFIG_VER}
1157 - )
1158 - arm64? (
1159 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
1160 - -> kernel-aarch64-fedora.config.${CONFIG_VER}
1161 - )
1162 - ppc64? (
1163 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
1164 - -> kernel-ppc64le-fedora.config.${CONFIG_VER}
1165 - )
1166 - x86? (
1167 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
1168 - -> kernel-i686-fedora.config.${CONFIG_VER}
1169 - )"
1170 -S=${WORKDIR}/${MY_P}
1171 -
1172 -LICENSE="GPL-2"
1173 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
1174 -IUSE="debug"
1175 -REQUIRED_USE="
1176 - arm? ( savedconfig )"
1177 -
1178 -RDEPEND="
1179 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
1180 -BDEPEND="
1181 - debug? ( dev-util/dwarves )"
1182 -
1183 -pkg_pretend() {
1184 - ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
1185 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
1186 -
1187 - kernel-install_pkg_pretend
1188 -}
1189 -
1190 -src_prepare() {
1191 - default
1192 -
1193 - # prepare the default config
1194 - case ${ARCH} in
1195 - amd64)
1196 - cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
1197 - ;;
1198 - arm)
1199 - return
1200 - ;;
1201 - arm64)
1202 - cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
1203 - ;;
1204 - ppc64)
1205 - cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
1206 - ;;
1207 - x86)
1208 - cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
1209 - ;;
1210 - *)
1211 - die "Unsupported arch ${ARCH}"
1212 - ;;
1213 - esac
1214 -
1215 - local config_tweaks=(
1216 - # replace (none) with gentoo
1217 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
1218 - # we do support x32
1219 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
1220 - # disable signatures
1221 - -e '/CONFIG_MODULE_SIG/d'
1222 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
1223 - -e '/CONFIG_KEXEC_SIG/d'
1224 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
1225 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
1226 - -e '/CONFIG_SIGNATURE/d'
1227 - # remove massive array of LSMs
1228 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
1229 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
1230 - # nobody actually wants fips
1231 - -e '/CONFIG_CRYPTO_FIPS/d'
1232 - # these tests are really not necessary
1233 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
1234 - # probably not needed by anybody but developers
1235 - -e '/CONFIG_CRYPTO_STATS/d'
1236 - # 1000hz is excessive for laptops
1237 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
1238 - # nobody is using this kernel on insane super computers
1239 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
1240 - # we're not actually producing live patches for folks
1241 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
1242 - # this slows down networking in general
1243 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
1244 - # include font for normal and hidpi screens
1245 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
1246 - # we don't need to actually install system headers from this ebuild
1247 - -e '/CONFIG_HEADERS_INSTALL/d'
1248 - # enable /proc/config.gz, used by linux-info.eclass
1249 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
1250 - )
1251 - use debug || config_tweaks+=(
1252 - -e '/CONFIG_DEBUG_INFO/d'
1253 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
1254 - -e '/CONFIG_DEBUG_VM/d'
1255 - -e '/CONFIG_DEBUG_SHIRQ/d'
1256 - -e '/CONFIG_DEBUG_LIST/d'
1257 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
1258 - -e '/CONFIG_TORTURE_TEST/d'
1259 - -e '/CONFIG_BOOTTIME_TRACING/d'
1260 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
1261 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
1262 - -e '/CONFIG_KGDB/d'
1263 - )
1264 - sed -i "${config_tweaks[@]}" .config || die
1265 -}
1266
1267 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.15.ebuild
1268 deleted file mode 100644
1269 index 540a5ea3c74..00000000000
1270 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.15.ebuild
1271 +++ /dev/null
1272 @@ -1,127 +0,0 @@
1273 -# Copyright 2020 Gentoo Authors
1274 -# Distributed under the terms of the GNU General Public License v2
1275 -
1276 -EAPI=7
1277 -
1278 -inherit kernel-build
1279 -
1280 -MY_P=linux-${PV}
1281 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
1282 -CONFIG_VER=5.8.5
1283 -CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
1284 -
1285 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
1286 -HOMEPAGE="https://www.kernel.org/"
1287 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
1288 - amd64? (
1289 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
1290 - -> kernel-x86_64-fedora.config.${CONFIG_VER}
1291 - )
1292 - arm64? (
1293 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
1294 - -> kernel-aarch64-fedora.config.${CONFIG_VER}
1295 - )
1296 - ppc64? (
1297 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
1298 - -> kernel-ppc64le-fedora.config.${CONFIG_VER}
1299 - )
1300 - x86? (
1301 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
1302 - -> kernel-i686-fedora.config.${CONFIG_VER}
1303 - )"
1304 -S=${WORKDIR}/${MY_P}
1305 -
1306 -LICENSE="GPL-2"
1307 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
1308 -IUSE="debug"
1309 -REQUIRED_USE="
1310 - arm? ( savedconfig )"
1311 -
1312 -RDEPEND="
1313 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
1314 -BDEPEND="
1315 - debug? ( dev-util/dwarves )"
1316 -
1317 -pkg_pretend() {
1318 - ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
1319 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
1320 -
1321 - kernel-install_pkg_pretend
1322 -}
1323 -
1324 -src_prepare() {
1325 - default
1326 -
1327 - # prepare the default config
1328 - case ${ARCH} in
1329 - amd64)
1330 - cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
1331 - ;;
1332 - arm)
1333 - return
1334 - ;;
1335 - arm64)
1336 - cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
1337 - ;;
1338 - ppc64)
1339 - cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
1340 - ;;
1341 - x86)
1342 - cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
1343 - ;;
1344 - *)
1345 - die "Unsupported arch ${ARCH}"
1346 - ;;
1347 - esac
1348 -
1349 - local config_tweaks=(
1350 - # replace (none) with gentoo
1351 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
1352 - # we do support x32
1353 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
1354 - # disable signatures
1355 - -e '/CONFIG_MODULE_SIG/d'
1356 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
1357 - -e '/CONFIG_KEXEC_SIG/d'
1358 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
1359 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
1360 - -e '/CONFIG_SIGNATURE/d'
1361 - # remove massive array of LSMs
1362 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
1363 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
1364 - # nobody actually wants fips
1365 - -e '/CONFIG_CRYPTO_FIPS/d'
1366 - # these tests are really not necessary
1367 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
1368 - # probably not needed by anybody but developers
1369 - -e '/CONFIG_CRYPTO_STATS/d'
1370 - # 1000hz is excessive for laptops
1371 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
1372 - # nobody is using this kernel on insane super computers
1373 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
1374 - # we're not actually producing live patches for folks
1375 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
1376 - # this slows down networking in general
1377 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
1378 - # include font for normal and hidpi screens
1379 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
1380 - # we don't need to actually install system headers from this ebuild
1381 - -e '/CONFIG_HEADERS_INSTALL/d'
1382 - # enable /proc/config.gz, used by linux-info.eclass
1383 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
1384 - )
1385 - use debug || config_tweaks+=(
1386 - -e '/CONFIG_DEBUG_INFO/d'
1387 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
1388 - -e '/CONFIG_DEBUG_VM/d'
1389 - -e '/CONFIG_DEBUG_SHIRQ/d'
1390 - -e '/CONFIG_DEBUG_LIST/d'
1391 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
1392 - -e '/CONFIG_TORTURE_TEST/d'
1393 - -e '/CONFIG_BOOTTIME_TRACING/d'
1394 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
1395 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
1396 - -e '/CONFIG_KGDB/d'
1397 - )
1398 - sed -i "${config_tweaks[@]}" .config || die
1399 -}
1400
1401 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.0.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.0.ebuild
1402 deleted file mode 100644
1403 index 23a364c9c33..00000000000
1404 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.0.ebuild
1405 +++ /dev/null
1406 @@ -1,127 +0,0 @@
1407 -# Copyright 2020 Gentoo Authors
1408 -# Distributed under the terms of the GNU General Public License v2
1409 -
1410 -EAPI=7
1411 -
1412 -inherit kernel-build
1413 -
1414 -MY_P=linux-${PV%.*}
1415 -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
1416 -CONFIG_VER=5.9.0
1417 -CONFIG_HASH=aa6d9438d030fa4682d5d450481085c901503da5
1418 -
1419 -DESCRIPTION="Linux kernel built from vanilla upstream sources"
1420 -HOMEPAGE="https://www.kernel.org/"
1421 -SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
1422 - amd64? (
1423 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
1424 - -> kernel-x86_64-fedora.config.${CONFIG_VER}
1425 - )
1426 - arm64? (
1427 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
1428 - -> kernel-aarch64-fedora.config.${CONFIG_VER}
1429 - )
1430 - ppc64? (
1431 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
1432 - -> kernel-ppc64le-fedora.config.${CONFIG_VER}
1433 - )
1434 - x86? (
1435 - https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
1436 - -> kernel-i686-fedora.config.${CONFIG_VER}
1437 - )"
1438 -S=${WORKDIR}/${MY_P}
1439 -
1440 -LICENSE="GPL-2"
1441 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
1442 -IUSE="debug"
1443 -REQUIRED_USE="
1444 - arm? ( savedconfig )"
1445 -
1446 -RDEPEND="
1447 - !sys-kernel/vanilla-kernel-bin:${SLOT}"
1448 -BDEPEND="
1449 - debug? ( dev-util/dwarves )"
1450 -
1451 -pkg_pretend() {
1452 - ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
1453 - ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
1454 -
1455 - kernel-install_pkg_pretend
1456 -}
1457 -
1458 -src_prepare() {
1459 - default
1460 -
1461 - # prepare the default config
1462 - case ${ARCH} in
1463 - amd64)
1464 - cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
1465 - ;;
1466 - arm)
1467 - return
1468 - ;;
1469 - arm64)
1470 - cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
1471 - ;;
1472 - ppc64)
1473 - cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
1474 - ;;
1475 - x86)
1476 - cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
1477 - ;;
1478 - *)
1479 - die "Unsupported arch ${ARCH}"
1480 - ;;
1481 - esac
1482 -
1483 - local config_tweaks=(
1484 - # replace (none) with gentoo
1485 - -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
1486 - # we do support x32
1487 - -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
1488 - # disable signatures
1489 - -e '/CONFIG_MODULE_SIG/d'
1490 - -e '/CONFIG_SECURITY_LOCKDOWN/d'
1491 - -e '/CONFIG_KEXEC_SIG/d'
1492 - -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
1493 - -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
1494 - -e '/CONFIG_SIGNATURE/d'
1495 - # remove massive array of LSMs
1496 - -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
1497 - -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
1498 - # nobody actually wants fips
1499 - -e '/CONFIG_CRYPTO_FIPS/d'
1500 - # these tests are really not necessary
1501 - -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
1502 - # probably not needed by anybody but developers
1503 - -e '/CONFIG_CRYPTO_STATS/d'
1504 - # 1000hz is excessive for laptops
1505 - -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
1506 - # nobody is using this kernel on insane super computers
1507 - -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
1508 - # we're not actually producing live patches for folks
1509 - -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
1510 - # this slows down networking in general
1511 - -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
1512 - # include font for normal and hidpi screens
1513 - -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
1514 - # we don't need to actually install system headers from this ebuild
1515 - -e '/CONFIG_HEADERS_INSTALL/d'
1516 - # enable /proc/config.gz, used by linux-info.eclass
1517 - -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
1518 - )
1519 - use debug || config_tweaks+=(
1520 - -e '/CONFIG_DEBUG_INFO/d'
1521 - -e '/CONFIG_DEBUG_RODATA_TEST/d'
1522 - -e '/CONFIG_DEBUG_VM/d'
1523 - -e '/CONFIG_DEBUG_SHIRQ/d'
1524 - -e '/CONFIG_DEBUG_LIST/d'
1525 - -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
1526 - -e '/CONFIG_TORTURE_TEST/d'
1527 - -e '/CONFIG_BOOTTIME_TRACING/d'
1528 - -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
1529 - -e '/CONFIG_X86_DECODER_SELFTEST/d'
1530 - -e '/CONFIG_KGDB/d'
1531 - )
1532 - sed -i "${config_tweaks[@]}" .config || die
1533 -}