1 |
commit: 79129d9161c0bdf4ee617ce4a9f5299d7f646765 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 16 21:28:27 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 16 21:28:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=79129d91 |
7 |
|
8 |
riscv: skip stage2 everywhere, go stage1 -> stage3 |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
releases/specs-qemu/riscv/stage2-ilp32.spec | 13 ------------- |
13 |
releases/specs-qemu/riscv/stage2-lp64-systemd.spec | 13 ------------- |
14 |
releases/specs-qemu/riscv/stage2-lp64.spec | 13 ------------- |
15 |
releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec | 13 ------------- |
16 |
releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec | 13 ------------- |
17 |
releases/specs-qemu/riscv/stage2-lp64d-systemd.spec | 13 ------------- |
18 |
releases/specs-qemu/riscv/stage2-lp64d.spec | 13 ------------- |
19 |
releases/specs-qemu/riscv/stage2-multilib.spec | 13 ------------- |
20 |
releases/specs-qemu/riscv/stage3-ilp32.spec | 2 +- |
21 |
releases/specs-qemu/riscv/stage3-lp64-systemd.spec | 2 +- |
22 |
releases/specs-qemu/riscv/stage3-lp64.spec | 2 +- |
23 |
releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec | 2 +- |
24 |
releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec | 2 +- |
25 |
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec | 2 +- |
26 |
releases/specs-qemu/riscv/stage3-lp64d.spec | 2 +- |
27 |
releases/specs-qemu/riscv/stage3-multilib.spec | 2 +- |
28 |
tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++-------- |
29 |
17 files changed, 16 insertions(+), 120 deletions(-) |
30 |
|
31 |
diff --git a/releases/specs-qemu/riscv/stage2-ilp32.spec b/releases/specs-qemu/riscv/stage2-ilp32.spec |
32 |
deleted file mode 100644 |
33 |
index c1ffdbf7..00000000 |
34 |
--- a/releases/specs-qemu/riscv/stage2-ilp32.spec |
35 |
+++ /dev/null |
36 |
@@ -1,13 +0,0 @@ |
37 |
-subarch: rv32_ilp32 |
38 |
-target: stage2 |
39 |
-version_stamp: @TIMESTAMP@ |
40 |
-cflags: -O2 -pipe |
41 |
-interpreter: /usr/bin/qemu-riscv32 |
42 |
-rel_type: default |
43 |
-profile: default/linux/riscv/17.0/rv32imac/ilp32 |
44 |
-snapshot: @TIMESTAMP@ |
45 |
-source_subpath: default/stage1-rv32_ilp32-@TIMESTAMP@ |
46 |
-compression_mode: pixz |
47 |
-decompressor_search_order: xz bzip2 |
48 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
49 |
-portage_prefix: releng |
50 |
|
51 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64-systemd.spec |
52 |
deleted file mode 100644 |
53 |
index 7b44190a..00000000 |
54 |
--- a/releases/specs-qemu/riscv/stage2-lp64-systemd.spec |
55 |
+++ /dev/null |
56 |
@@ -1,13 +0,0 @@ |
57 |
-subarch: rv64_lp64 |
58 |
-target: stage2 |
59 |
-version_stamp: systemd-@TIMESTAMP@ |
60 |
-cflags: -O2 -pipe |
61 |
-interpreter: /usr/bin/qemu-riscv64 |
62 |
-rel_type: default |
63 |
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd |
64 |
-snapshot: @TIMESTAMP@ |
65 |
-source_subpath: default/stage1-rv64_lp64-systemd-@TIMESTAMP@ |
66 |
-compression_mode: pixz |
67 |
-decompressor_search_order: xz bzip2 |
68 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
69 |
-portage_prefix: releng |
70 |
|
71 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64.spec b/releases/specs-qemu/riscv/stage2-lp64.spec |
72 |
deleted file mode 100644 |
73 |
index 0754a68a..00000000 |
74 |
--- a/releases/specs-qemu/riscv/stage2-lp64.spec |
75 |
+++ /dev/null |
76 |
@@ -1,13 +0,0 @@ |
77 |
-subarch: rv64_lp64 |
78 |
-target: stage2 |
79 |
-version_stamp: @TIMESTAMP@ |
80 |
-cflags: -O2 -pipe |
81 |
-interpreter: /usr/bin/qemu-riscv64 |
82 |
-rel_type: default |
83 |
-profile: default/linux/riscv/17.0/rv64gc/lp64 |
84 |
-snapshot: @TIMESTAMP@ |
85 |
-source_subpath: default/stage1-rv64_lp64-@TIMESTAMP@ |
86 |
-compression_mode: pixz |
87 |
-decompressor_search_order: xz bzip2 |
88 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
89 |
-portage_prefix: releng |
90 |
|
91 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec |
92 |
deleted file mode 100644 |
93 |
index 241ace4d..00000000 |
94 |
--- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec |
95 |
+++ /dev/null |
96 |
@@ -1,13 +0,0 @@ |
97 |
-subarch: rv64_lp64d |
98 |
-target: stage2 |
99 |
-version_stamp: 20.0-openrc-@TIMESTAMP@ |
100 |
-cflags: -O2 -pipe |
101 |
-interpreter: /usr/bin/qemu-riscv64 |
102 |
-rel_type: 20.0 |
103 |
-profile: default/linux/riscv/20.0/rv64gc/lp64d |
104 |
-snapshot: @TIMESTAMP@ |
105 |
-source_subpath: 20.0/stage1-rv64_lp64d-20.0-openrc-@TIMESTAMP@ |
106 |
-compression_mode: pixz |
107 |
-decompressor_search_order: xz bzip2 |
108 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
109 |
-portage_prefix: releng |
110 |
|
111 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec |
112 |
deleted file mode 100644 |
113 |
index 4685179c..00000000 |
114 |
--- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec |
115 |
+++ /dev/null |
116 |
@@ -1,13 +0,0 @@ |
117 |
-subarch: rv64_lp64d |
118 |
-target: stage2 |
119 |
-version_stamp: 20.0-systemd-@TIMESTAMP@ |
120 |
-cflags: -O2 -pipe |
121 |
-interpreter: /usr/bin/qemu-riscv64 |
122 |
-rel_type: 20.0 |
123 |
-profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd |
124 |
-snapshot: @TIMESTAMP@ |
125 |
-source_subpath: 20.0/stage1-rv64_lp64d-20.0-systemd-@TIMESTAMP@ |
126 |
-compression_mode: pixz |
127 |
-decompressor_search_order: xz bzip2 |
128 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
129 |
-portage_prefix: releng |
130 |
|
131 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec |
132 |
deleted file mode 100644 |
133 |
index 06d89a6b..00000000 |
134 |
--- a/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec |
135 |
+++ /dev/null |
136 |
@@ -1,13 +0,0 @@ |
137 |
-subarch: rv64_lp64d |
138 |
-target: stage2 |
139 |
-version_stamp: systemd-@TIMESTAMP@ |
140 |
-cflags: -O2 -pipe |
141 |
-interpreter: /usr/bin/qemu-riscv64 |
142 |
-rel_type: default |
143 |
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd |
144 |
-snapshot: @TIMESTAMP@ |
145 |
-source_subpath: default/stage1-rv64_lp64d-systemd-@TIMESTAMP@ |
146 |
-compression_mode: pixz |
147 |
-decompressor_search_order: xz bzip2 |
148 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
149 |
-portage_prefix: releng |
150 |
|
151 |
diff --git a/releases/specs-qemu/riscv/stage2-lp64d.spec b/releases/specs-qemu/riscv/stage2-lp64d.spec |
152 |
deleted file mode 100644 |
153 |
index 6a231f87..00000000 |
154 |
--- a/releases/specs-qemu/riscv/stage2-lp64d.spec |
155 |
+++ /dev/null |
156 |
@@ -1,13 +0,0 @@ |
157 |
-subarch: rv64_lp64d |
158 |
-target: stage2 |
159 |
-version_stamp: @TIMESTAMP@ |
160 |
-cflags: -O2 -pipe |
161 |
-interpreter: /usr/bin/qemu-riscv64 |
162 |
-rel_type: default |
163 |
-profile: default/linux/riscv/17.0/rv64gc/lp64d |
164 |
-snapshot: @TIMESTAMP@ |
165 |
-source_subpath: default/stage1-rv64_lp64d-@TIMESTAMP@ |
166 |
-compression_mode: pixz |
167 |
-decompressor_search_order: xz bzip2 |
168 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
169 |
-portage_prefix: releng |
170 |
|
171 |
diff --git a/releases/specs-qemu/riscv/stage2-multilib.spec b/releases/specs-qemu/riscv/stage2-multilib.spec |
172 |
deleted file mode 100644 |
173 |
index 05ce3407..00000000 |
174 |
--- a/releases/specs-qemu/riscv/stage2-multilib.spec |
175 |
+++ /dev/null |
176 |
@@ -1,13 +0,0 @@ |
177 |
-subarch: rv64_multilib |
178 |
-target: stage2 |
179 |
-version_stamp: @TIMESTAMP@ |
180 |
-cflags: -O2 -pipe -g |
181 |
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32 |
182 |
-rel_type: default |
183 |
-profile: default/linux/riscv/17.0/rv64gc |
184 |
-snapshot: @TIMESTAMP@ |
185 |
-source_subpath: default/stage1-rv64_multilib-@TIMESTAMP@ |
186 |
-compression_mode: pixz |
187 |
-decompressor_search_order: xz bzip2 |
188 |
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
189 |
-portage_prefix: releng |
190 |
|
191 |
diff --git a/releases/specs-qemu/riscv/stage3-ilp32.spec b/releases/specs-qemu/riscv/stage3-ilp32.spec |
192 |
index b477807e..36921587 100644 |
193 |
--- a/releases/specs-qemu/riscv/stage3-ilp32.spec |
194 |
+++ b/releases/specs-qemu/riscv/stage3-ilp32.spec |
195 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv32 |
196 |
rel_type: default |
197 |
profile: default/linux/riscv/17.0/rv32imac/ilp32 |
198 |
snapshot: @TIMESTAMP@ |
199 |
-source_subpath: default/stage2-rv32_ilp32-@TIMESTAMP@ |
200 |
+source_subpath: default/stage1-rv32_ilp32-@TIMESTAMP@ |
201 |
compression_mode: pixz |
202 |
decompressor_search_order: xz bzip2 |
203 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
204 |
|
205 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec |
206 |
index 5f916ecb..873acc29 100644 |
207 |
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec |
208 |
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec |
209 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
210 |
rel_type: default |
211 |
profile: default/linux/riscv/17.0/rv64gc/lp64/systemd |
212 |
snapshot: @TIMESTAMP@ |
213 |
-source_subpath: default/stage2-rv64_lp64-systemd-@TIMESTAMP@ |
214 |
+source_subpath: default/stage1-rv64_lp64-systemd-@TIMESTAMP@ |
215 |
compression_mode: pixz |
216 |
decompressor_search_order: xz bzip2 |
217 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
218 |
|
219 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64.spec b/releases/specs-qemu/riscv/stage3-lp64.spec |
220 |
index 79315ba0..708c8b58 100644 |
221 |
--- a/releases/specs-qemu/riscv/stage3-lp64.spec |
222 |
+++ b/releases/specs-qemu/riscv/stage3-lp64.spec |
223 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
224 |
rel_type: default |
225 |
profile: default/linux/riscv/17.0/rv64gc/lp64 |
226 |
snapshot: @TIMESTAMP@ |
227 |
-source_subpath: default/stage2-rv64_lp64-@TIMESTAMP@ |
228 |
+source_subpath: default/stage1-rv64_lp64-@TIMESTAMP@ |
229 |
compression_mode: pixz |
230 |
decompressor_search_order: xz bzip2 |
231 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
232 |
|
233 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec |
234 |
index f4f1c8a0..56850d34 100644 |
235 |
--- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec |
236 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec |
237 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
238 |
rel_type: 20.0 |
239 |
profile: default/linux/riscv/20.0/rv64gc/lp64d |
240 |
snapshot: @TIMESTAMP@ |
241 |
-source_subpath: 20.0/stage2-rv64_lp64d-20.0-openrc-@TIMESTAMP@ |
242 |
+source_subpath: 20.0/stage1-rv64_lp64d-20.0-openrc-@TIMESTAMP@ |
243 |
compression_mode: pixz |
244 |
decompressor_search_order: xz bzip2 |
245 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
246 |
|
247 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec |
248 |
index 77d57710..278ceb87 100644 |
249 |
--- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec |
250 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec |
251 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
252 |
rel_type: 20.0 |
253 |
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd |
254 |
snapshot: @TIMESTAMP@ |
255 |
-source_subpath: 20.0/stage2-rv64_lp64d-20.0-systemd-@TIMESTAMP@ |
256 |
+source_subpath: 20.0/stage1-rv64_lp64d-20.0-systemd-@TIMESTAMP@ |
257 |
compression_mode: pixz |
258 |
decompressor_search_order: xz bzip2 |
259 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
260 |
|
261 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec |
262 |
index 21e8096e..075c5b15 100644 |
263 |
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec |
264 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec |
265 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
266 |
rel_type: default |
267 |
profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd |
268 |
snapshot: @TIMESTAMP@ |
269 |
-source_subpath: default/stage2-rv64_lp64d-systemd-@TIMESTAMP@ |
270 |
+source_subpath: default/stage1-rv64_lp64d-systemd-@TIMESTAMP@ |
271 |
compression_mode: pixz |
272 |
decompressor_search_order: xz bzip2 |
273 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
274 |
|
275 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d.spec b/releases/specs-qemu/riscv/stage3-lp64d.spec |
276 |
index 55b252fd..22861abc 100644 |
277 |
--- a/releases/specs-qemu/riscv/stage3-lp64d.spec |
278 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d.spec |
279 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 |
280 |
rel_type: default |
281 |
profile: default/linux/riscv/17.0/rv64gc/lp64d |
282 |
snapshot: @TIMESTAMP@ |
283 |
-source_subpath: default/stage2-rv64_lp64d-@TIMESTAMP@ |
284 |
+source_subpath: default/stage1-rv64_lp64d-@TIMESTAMP@ |
285 |
compression_mode: pixz |
286 |
decompressor_search_order: xz bzip2 |
287 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
288 |
|
289 |
diff --git a/releases/specs-qemu/riscv/stage3-multilib.spec b/releases/specs-qemu/riscv/stage3-multilib.spec |
290 |
index 289bc34a..b6458820 100644 |
291 |
--- a/releases/specs-qemu/riscv/stage3-multilib.spec |
292 |
+++ b/releases/specs-qemu/riscv/stage3-multilib.spec |
293 |
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32 |
294 |
rel_type: default |
295 |
profile: default/linux/riscv/17.0/rv64gc |
296 |
snapshot: @TIMESTAMP@ |
297 |
-source_subpath: default/stage2-rv64_multilib-@TIMESTAMP@ |
298 |
+source_subpath: default/stage1-rv64_multilib-@TIMESTAMP@ |
299 |
compression_mode: pixz |
300 |
decompressor_search_order: xz bzip2 |
301 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
302 |
|
303 |
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf |
304 |
index a1ebcf8e..e55cd0e5 100644 |
305 |
--- a/tools/catalyst-auto-qemu-riscv.conf |
306 |
+++ b/tools/catalyst-auto-qemu-riscv.conf |
307 |
@@ -23,17 +23,17 @@ SETS=" |
308 |
# ilp32 |
309 |
# multilib needs re-bootstrapping |
310 |
|
311 |
-SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec" |
312 |
+SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec" |
313 |
|
314 |
-SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage2-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec" |
315 |
-SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage2-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec" |
316 |
+SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec" |
317 |
+SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec" |
318 |
|
319 |
-SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec" |
320 |
-SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec" |
321 |
-SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec" |
322 |
-SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec" |
323 |
+SET_lp64d_SPECS="stage1-lp64d.spec stage3-lp64d.spec" |
324 |
+SET_lp64_SPECS="stage1-lp64.spec stage3-lp64.spec" |
325 |
+SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec" |
326 |
+SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec" |
327 |
|
328 |
-SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec" |
329 |
+SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec" |
330 |
|
331 |
update_symlinks() { |
332 |
# Symlink the latest stages3 to build from |