1 |
commit: fa5b95a0f7e23e3fdfcd9a97ec89329fafd7cc0e |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 27 16:57:21 2018 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 27 16:57:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fa5b95a0 |
7 |
|
8 |
remove unneeded/obsolete gk_mainargs from *cd-stage2*.spec |
9 |
|
10 |
There is no reason for the livecd initramfs to need to be able to open |
11 |
mdraid/dmraid/lvm arrays, so we can remove this support from the |
12 |
genkernel call. The livecds will still have all the tools needed to |
13 |
create/maintain/use these kinds of volumes later. |
14 |
|
15 |
Modern genkernel also autodetects makeopts so we do not need to set that |
16 |
explicitly. |
17 |
|
18 |
releases/weekly/specs/alpha/installcd-stage2-minimal.spec | 1 - |
19 |
releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 1 - |
20 |
releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 1 - |
21 |
releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 1 - |
22 |
releases/weekly/specs/amd64/livecd-stage2.spec | 1 - |
23 |
releases/weekly/specs/amd64/livedvd-stage2.spec | 1 - |
24 |
releases/weekly/specs/hppa/installcd-stage2-universal.spec | 1 - |
25 |
releases/weekly/specs/ia64/installcd-stage2-minimal.spec | 1 - |
26 |
releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec | 2 +- |
27 |
releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec | 2 +- |
28 |
releases/weekly/specs/x86/hardened/admincd-stage2.spec | 1 - |
29 |
releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 1 - |
30 |
releases/weekly/specs/x86/i686/livecd-stage2.spec | 1 - |
31 |
releases/weekly/specs/x86/i686/livedvd-stage2.spec | 1 - |
32 |
releases/weekly/specs/x86/installcd-stage2-minimal.spec | 1 - |
33 |
15 files changed, 2 insertions(+), 15 deletions(-) |
34 |
|
35 |
diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec |
36 |
index f556611c..5bbbce01 100644 |
37 |
--- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec |
38 |
+++ b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec |
39 |
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap |
40 |
livecd/cdtar: /space/armin76/tmp/aboot-1.0_pre20040408-r2-cdtar-weekly.tar.bz2 |
41 |
livecd/fsscript: /space/armin76/releng/releases/weekly/scripts/livecd.sh |
42 |
livecd/fstype: squashfs |
43 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm |
44 |
livecd/iso: /space/catalyst/builds/default/install-alpha-minimal-2008.0.iso |
45 |
livecd/type: gentoo-release-minimal |
46 |
livecd/volid: Gentoo alpha latest |
47 |
|
48 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
49 |
index 63aab88a..87ce8a14 100644 |
50 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
51 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
52 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
53 |
livecd/bootargs: dokeymap |
54 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
55 |
livecd/fstype: squashfs |
56 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
57 |
livecd/iso: admincd-amd64-latest.iso |
58 |
livecd/type: gentoo-release-minimal |
59 |
livecd/volid: Gentoo amd64 AdminCD latest |
60 |
|
61 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
62 |
index 378b590b..4baa0ce1 100644 |
63 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
64 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
65 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
66 |
livecd/bootargs: dokeymap |
67 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
68 |
livecd/fstype: squashfs |
69 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
70 |
livecd/iso: admincd-amd64-latest.iso |
71 |
livecd/type: gentoo-release-minimal |
72 |
livecd/volid: Gentoo amd64 AdminCD latest |
73 |
|
74 |
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
75 |
index e8da74a7..3e5f97e0 100644 |
76 |
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
77 |
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
78 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
79 |
livecd/bootargs: dokeymap |
80 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
81 |
livecd/fstype: squashfs |
82 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
83 |
livecd/iso: install-amd64-minimal-latest.iso |
84 |
livecd/type: gentoo-release-minimal |
85 |
livecd/volid: Gentoo amd64 latest |
86 |
|
87 |
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec |
88 |
index 93227946..25b9c74f 100644 |
89 |
--- a/releases/weekly/specs/amd64/livecd-stage2.spec |
90 |
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec |
91 |
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap |
92 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
93 |
livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh |
94 |
livecd/fstype: squashfs |
95 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
96 |
livecd/iso: livecd-amd64-installer-latest.iso |
97 |
livecd/type: gentoo-release-livecd |
98 |
livecd/volid: Gentoo amd64 LiveCD latest |
99 |
|
100 |
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec |
101 |
index 16225529..f33d71b5 100644 |
102 |
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec |
103 |
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec |
104 |
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap |
105 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
106 |
livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh |
107 |
livecd/fstype: squashfs |
108 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
109 |
livecd/iso: livedvd-amd64-installer-latest.iso |
110 |
livecd/type: gentoo-release-livecd |
111 |
livecd/volid: Gentoo amd64 LiveDVD latest |
112 |
|
113 |
diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
114 |
index fd88f959..f5a845b7 100644 |
115 |
--- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
116 |
+++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
117 |
@@ -9,7 +9,6 @@ source_subpath: default/livecd-stage1-hppa1.1-2008.0 |
118 |
livecd/bootargs: dokeymap |
119 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 |
120 |
livecd/fstype: squashfs |
121 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm |
122 |
livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2008.0.iso |
123 |
livecd/type: gentoo-release-universal |
124 |
|
125 |
|
126 |
diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec |
127 |
index 0f505d39..3aa356fb 100644 |
128 |
--- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec |
129 |
+++ b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec |
130 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
131 |
livecd/bootargs: dokeymap |
132 |
livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2 |
133 |
livecd/fstype: squashfs |
134 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm |
135 |
livecd/iso: /home/catalyst/builds/default/install-ia64-minimal-2008.0.iso |
136 |
livecd/type: gentoo-release-minimal |
137 |
livecd/volid: Gentoo ia64 latest |
138 |
|
139 |
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
140 |
index cabb3bd7..34b7726c 100644 |
141 |
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
142 |
+++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
143 |
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-ppc64-32ul-2008.0 |
144 |
|
145 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 |
146 |
livecd/fstype: squashfs |
147 |
-livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --mdadm |
148 |
+livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc |
149 |
livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso |
150 |
livecd/overlay: /home/ranger/2008.0/ppccdoverlay/ |
151 |
livecd/type: gentoo-release-minimal |
152 |
|
153 |
diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec |
154 |
index 76f701e9..abb8b297 100644 |
155 |
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec |
156 |
+++ b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec |
157 |
@@ -11,7 +11,7 @@ livecd/fstype: squashfs |
158 |
livecd/iso: /var/tmp/catalyst/builds/default/install-sparc64-minimal-2008.0.iso |
159 |
livecd/type: gentoo-release-minimal |
160 |
livecd/volid: Gentoo sparc64 latest |
161 |
-livecd/gk_mainargs: --firmware-files=/lib/firmware/ql2200_fw.bin --makeopts=-j33 |
162 |
+livecd/gk_mainargs: --firmware-files=/lib/firmware/ql2200_fw.bin |
163 |
|
164 |
boot/kernel: gentoo |
165 |
|
166 |
|
167 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
168 |
index 9948e90b..7c2db377 100644 |
169 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
170 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
171 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
172 |
livecd/bootargs: dokeymap |
173 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
174 |
livecd/fstype: squashfs |
175 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
176 |
livecd/iso: admincd-x86-latest.iso |
177 |
livecd/type: gentoo-release-minimal |
178 |
livecd/volid: Gentoo x86 AdminCD latest |
179 |
|
180 |
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
181 |
index 2fc7e94d..ce87e81e 100644 |
182 |
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
183 |
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
184 |
@@ -9,7 +9,6 @@ source_subpath: hardened/livecd-stage1-x86-hardened-latest |
185 |
livecd/bootargs: dokeymap |
186 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
187 |
livecd/fstype: squashfs |
188 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
189 |
livecd/iso: install-x86-minimal-latest.iso |
190 |
livecd/type: gentoo-release-minimal |
191 |
livecd/volid: Gentoo x86 latest |
192 |
|
193 |
diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec |
194 |
index 1aee59c2..0d6ff77a 100644 |
195 |
--- a/releases/weekly/specs/x86/i686/livecd-stage2.spec |
196 |
+++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec |
197 |
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap |
198 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
199 |
livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh |
200 |
livecd/fstype: squashfs |
201 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
202 |
livecd/iso: livecd-i686-installer-latest.iso |
203 |
livecd/type: gentoo-release-livecd |
204 |
livecd/volid: Gentoo x86 LiveCD latest |
205 |
|
206 |
diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
207 |
index 52cba741..a73c518f 100644 |
208 |
--- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
209 |
+++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
210 |
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap |
211 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
212 |
livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh |
213 |
livecd/fstype: squashfs |
214 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
215 |
livecd/iso: livedvd-i686-installer-latest.iso |
216 |
livecd/type: gentoo-release-livecd |
217 |
livecd/volid: Gentoo x86 LiveDVD latest |
218 |
|
219 |
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
220 |
index 81ff72a4..e3c59ed0 100644 |
221 |
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
222 |
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
223 |
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
224 |
livecd/bootargs: dokeymap |
225 |
livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
226 |
livecd/fstype: squashfs |
227 |
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
228 |
livecd/iso: install-x86-minimal-latest.iso |
229 |
livecd/type: gentoo-release-minimal |
230 |
livecd/volid: Gentoo x86 latest |