1 |
commit: 57831ef0acdbc50bf51e0204ea5c74aa7af27c2d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 9 20:59:29 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 9 21:00:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57831ef0 |
7 |
|
8 |
sys-kernel/vanilla-kernel: Revert "Bump to 5.4.10, use kernel-build.eclass" |
9 |
|
10 |
Reverts: 6de9c4526dc8d29f2480f7080aa0a62e1c61f2cc |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
sys-kernel/vanilla-kernel/Manifest | 1 - |
14 |
.../vanilla-kernel/vanilla-kernel-5.4.10.ebuild | 71 ---------------------- |
15 |
2 files changed, 72 deletions(-) |
16 |
|
17 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
18 |
index 26dcb4ed4d0..0e5750feae1 100644 |
19 |
--- a/sys-kernel/vanilla-kernel/Manifest |
20 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST linux-5.4.10.tar.xz 109453652 BLAKE2B 88706cfc05ec1cc201f08e069dc6ad4f8e6fb49dbef5937208ba1e752e18b46639a5d32d4d0e270a0f2f6ed872aed70beeb2b0367d41fe443437331902a90bb2 SHA512 6328ad7e18b6fa982415b0de75e3384f58ce8428bd8c212871a31f3885a0819d241138d384b2e6d1b74a1d260229a027f9c1674a65f5b6c48e6b25e3024a0974 |
23 |
DIST linux-5.4.3-arch1.i686.config 241295 BLAKE2B 795b6286bd1e7dc6aa5c1428e7bf08c204ce6c8cbee57863e9f64f8990790cc4398a7d062b54c89b1b80640f02a40fce028d9397725db0f968e8028b0611a20f SHA512 8c7387ded21c02b9cffee0e6d61a7040c44deae21764f743f7719f0d1c7adf684f6b62a501fe31709787ba741859e55fc3b8a3d3d27e52c09f2d8604212bf0a7 |
24 |
DIST linux-5.4.7.arch1-1.amd64.config 241598 BLAKE2B 536cce5cc23cf20e71cba7468a125557f85d8ffc3cb194dced79bd489d39f2e4ed3960816d15d1491007d11b3af466e0a74267f983dfcc5f511f9f566f7e9821 SHA512 8658db603e180c75caf76972d85ecf8a4e9c9cf6e047b4f9fc7cba0fa426f434361528c1c29b5580f116cdd23091bf9afb6635d751f3b90c4e968d16db90eac1 |
25 |
DIST linux-5.4.7.tar.xz 109448088 BLAKE2B 70197bb6955253710be5b56660dd6e224d3415f9074afeac9525d28089a6c1aa307408cf6bf460370093b8d079837850136a06dee2f3203370ed6cd8ab4d6e66 SHA512 b3b6c843bb8210acf04d294887b527c2da10507ac731fe9f6f04cd21486d519cda5767a2ba094f10886717720ca3bd3dee22a650c213b7f8f6c1f825396dbed4 |
26 |
|
27 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.10.ebuild |
28 |
deleted file mode 100644 |
29 |
index 0733939284b..00000000000 |
30 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.10.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,71 +0,0 @@ |
33 |
-# Copyright 2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit kernel-build |
39 |
- |
40 |
-MY_P=linux-${PV} |
41 |
-AMD64_CONFIG_VER=5.4.7.arch1-1 |
42 |
-AMD64_CONFIG_HASH=ff79453bc0451a9083bdaa02c3901372d61a9982 |
43 |
-I686_CONFIG_VER=5.4.3-arch1 |
44 |
-I686_CONFIG_HASH=076a52d43a08c4b3a3eacd1f2f9a855fb3b62f42 |
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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH} |
51 |
- -> linux-${AMD64_CONFIG_VER}.amd64.config |
52 |
- ) |
53 |
- x86? ( |
54 |
- https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH} |
55 |
- -> linux-${I686_CONFIG_VER}.i686.config |
56 |
- )" |
57 |
-S=${WORKDIR}/${MY_P} |
58 |
- |
59 |
-LICENSE="GPL-2" |
60 |
-KEYWORDS="~amd64 ~x86" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- !sys-kernel/vanilla-kernel-bin:${SLOT}" |
64 |
- |
65 |
-pkg_pretend() { |
66 |
- mount-boot_pkg_pretend |
67 |
- |
68 |
- ewarn "This is an experimental package. The built kernel and/or initramfs" |
69 |
- ewarn "may not work at all or fail with your bootloader configuration. Please" |
70 |
- ewarn "make sure to keep a backup kernel available before testing it." |
71 |
-} |
72 |
- |
73 |
-src_prepare() { |
74 |
- default |
75 |
- |
76 |
- # prepare the default config |
77 |
- case ${ARCH} in |
78 |
- amd64) |
79 |
- cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die |
80 |
- ;; |
81 |
- x86) |
82 |
- cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die |
83 |
- ;; |
84 |
- *) |
85 |
- die "Unsupported arch ${ARCH}" |
86 |
- ;; |
87 |
- esac |
88 |
- |
89 |
- local config_tweaks=( |
90 |
- # shove arch under the carpet! |
91 |
- -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":' |
92 |
- # we do support x32 |
93 |
- -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:' |
94 |
- # disable signatures |
95 |
- -e '/CONFIG_MODULE_SIG/d' |
96 |
- -e '/CONFIG_SECURITY_LOCKDOWN/d' |
97 |
- # disable compression to allow stripping |
98 |
- -e '/CONFIG_MODULE_COMPRESS/d' |
99 |
- # disable gcc plugins to unbreak distcc |
100 |
- -e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d' |
101 |
- ) |
102 |
- sed -i "${config_tweaks[@]}" .config || die |
103 |
-} |