1 |
commit: 73dfdcaca31dd32d560a7e042cd2147542025ec2 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 28 17:45:41 2017 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 7 03:31:14 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=73dfdcac |
7 |
|
8 |
Add portage_prefix to the specs to finally clean-up /etc/portage/package.*/releng - fixes bug 547538. |
9 |
|
10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
11 |
|
12 |
releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec | 1 + |
13 |
releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec | 1 + |
14 |
releases/weekly/specs/amd64/hardened/stage1-selinux.spec | 1 + |
15 |
releases/weekly/specs/amd64/hardened/stage1.spec | 1 + |
16 |
releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec | 1 + |
17 |
releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec | 1 + |
18 |
releases/weekly/specs/amd64/hardened/stage2-selinux.spec | 1 + |
19 |
releases/weekly/specs/amd64/hardened/stage2.spec | 1 + |
20 |
releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec | 1 + |
21 |
releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec | 1 + |
22 |
releases/weekly/specs/amd64/hardened/stage3-selinux.spec | 1 + |
23 |
releases/weekly/specs/amd64/hardened/stage3.spec | 1 + |
24 |
releases/weekly/specs/amd64/stage1-nomultilib.spec | 1 + |
25 |
releases/weekly/specs/amd64/stage1-systemd.spec | 1 + |
26 |
releases/weekly/specs/amd64/stage1-x32.spec | 1 + |
27 |
releases/weekly/specs/amd64/stage1.spec | 1 + |
28 |
releases/weekly/specs/amd64/stage2-desktop.spec | 1 + |
29 |
releases/weekly/specs/amd64/stage2-nomultilib.spec | 1 + |
30 |
releases/weekly/specs/amd64/stage2-systemd.spec | 1 + |
31 |
releases/weekly/specs/amd64/stage2-x32.spec | 1 + |
32 |
releases/weekly/specs/amd64/stage2.spec | 1 + |
33 |
releases/weekly/specs/amd64/stage3-desktop.spec | 1 + |
34 |
releases/weekly/specs/amd64/stage3-nomultilib.spec | 1 + |
35 |
releases/weekly/specs/amd64/stage3-systemd.spec | 1 + |
36 |
releases/weekly/specs/amd64/stage3-x32.spec | 1 + |
37 |
releases/weekly/specs/amd64/stage3.spec | 1 + |
38 |
releases/weekly/specs/x86/hardened/stage1.spec | 1 + |
39 |
releases/weekly/specs/x86/hardened/stage2.spec | 1 + |
40 |
releases/weekly/specs/x86/hardened/stage3.spec | 1 + |
41 |
releases/weekly/specs/x86/i686/hardened/stage2.spec | 1 + |
42 |
releases/weekly/specs/x86/i686/hardened/stage3.spec | 1 + |
43 |
releases/weekly/specs/x86/i686/stage1.spec | 1 + |
44 |
releases/weekly/specs/x86/i686/stage2-desktop.spec | 1 + |
45 |
releases/weekly/specs/x86/i686/stage2.spec | 1 + |
46 |
releases/weekly/specs/x86/i686/stage3-desktop.spec | 1 + |
47 |
releases/weekly/specs/x86/i686/stage3.spec | 1 + |
48 |
releases/weekly/specs/x86/stage1.spec | 1 + |
49 |
releases/weekly/specs/x86/stage2.spec | 1 + |
50 |
releases/weekly/specs/x86/stage3.spec | 1 + |
51 |
39 files changed, 39 insertions(+) |
52 |
|
53 |
diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec |
54 |
index 1f1e6f60..1dab9a14 100644 |
55 |
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec |
56 |
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec |
57 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
58 |
update_seed: yes |
59 |
update_seed_command: --update --deep @world |
60 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
61 |
+portage_prefix: releng |
62 |
|
63 |
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec |
64 |
index 6e232717..e17eebb8 100644 |
65 |
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec |
66 |
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec |
67 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
68 |
update_seed: yes |
69 |
update_seed_command: --update --deep @world |
70 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
71 |
+portage_prefix: releng |
72 |
|
73 |
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec |
74 |
index b4829421..c331b30c 100644 |
75 |
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec |
76 |
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec |
77 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
78 |
update_seed: yes |
79 |
update_seed_command: --update --deep @world |
80 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
81 |
+portage_prefix: releng |
82 |
|
83 |
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec |
84 |
index 669c798b..744262b2 100644 |
85 |
--- a/releases/weekly/specs/amd64/hardened/stage1.spec |
86 |
+++ b/releases/weekly/specs/amd64/hardened/stage1.spec |
87 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
88 |
update_seed: yes |
89 |
update_seed_command: --update --deep @world |
90 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
91 |
+portage_prefix: releng |
92 |
|
93 |
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec |
94 |
index 4768ecc9..32ed2925 100644 |
95 |
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec |
96 |
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec |
97 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest |
98 |
compression_mode: pixz_x |
99 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
100 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
101 |
+portage_prefix: releng |
102 |
|
103 |
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec |
104 |
index fa9614b9..9ef16474 100644 |
105 |
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec |
106 |
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec |
107 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest |
108 |
compression_mode: pixz_x |
109 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
110 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
111 |
+portage_prefix: releng |
112 |
|
113 |
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec |
114 |
index dd3d806d..f5ffab88 100644 |
115 |
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec |
116 |
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec |
117 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-selinux-latest |
118 |
compression_mode: pixz_x |
119 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
120 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
121 |
+portage_prefix: releng |
122 |
|
123 |
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec |
124 |
index 9462e8c4..be3f0ef2 100644 |
125 |
--- a/releases/weekly/specs/amd64/hardened/stage2.spec |
126 |
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec |
127 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-latest |
128 |
compression_mode: pixz_x |
129 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
130 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
131 |
+portage_prefix: releng |
132 |
|
133 |
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec |
134 |
index 87f8e9f8..8fe59a8f 100644 |
135 |
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec |
136 |
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec |
137 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest |
138 |
compression_mode: pixz_x |
139 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
140 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
141 |
+portage_prefix: releng |
142 |
|
143 |
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec |
144 |
index 735e62b7..a7b0e935 100644 |
145 |
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec |
146 |
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec |
147 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest |
148 |
compression_mode: pixz_x |
149 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
150 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
151 |
+portage_prefix: releng |
152 |
|
153 |
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec |
154 |
index 2d6f876e..77c1d501 100644 |
155 |
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec |
156 |
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec |
157 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-selinux-latest |
158 |
compression_mode: pixz_x |
159 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
160 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
161 |
+portage_prefix: releng |
162 |
|
163 |
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec |
164 |
index eebf6b90..fd9e5859 100644 |
165 |
--- a/releases/weekly/specs/amd64/hardened/stage3.spec |
166 |
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec |
167 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-latest |
168 |
compression_mode: pixz_x |
169 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
170 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
171 |
+portage_prefix: releng |
172 |
|
173 |
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec |
174 |
index 7f4f7889..44919051 100644 |
175 |
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec |
176 |
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec |
177 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
178 |
update_seed: yes |
179 |
update_seed_command: --update --deep @world |
180 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
181 |
+portage_prefix: releng |
182 |
|
183 |
diff --git a/releases/weekly/specs/amd64/stage1-systemd.spec b/releases/weekly/specs/amd64/stage1-systemd.spec |
184 |
index 8bad2571..978e31b3 100644 |
185 |
--- a/releases/weekly/specs/amd64/stage1-systemd.spec |
186 |
+++ b/releases/weekly/specs/amd64/stage1-systemd.spec |
187 |
@@ -8,3 +8,4 @@ source_subpath: default/stage3-amd64-latest |
188 |
update_seed: yes |
189 |
update_seed_command: --update --deep @world |
190 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
191 |
+portage_prefix: releng |
192 |
|
193 |
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec |
194 |
index c90620bf..d9025c7c 100644 |
195 |
--- a/releases/weekly/specs/amd64/stage1-x32.spec |
196 |
+++ b/releases/weekly/specs/amd64/stage1-x32.spec |
197 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
198 |
update_seed: yes |
199 |
update_seed_command: --update --deep @world |
200 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
201 |
+portage_prefix: releng |
202 |
|
203 |
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec |
204 |
index 02459a03..ef73ed9d 100644 |
205 |
--- a/releases/weekly/specs/amd64/stage1.spec |
206 |
+++ b/releases/weekly/specs/amd64/stage1.spec |
207 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
208 |
update_seed: yes |
209 |
update_seed_command: --update --deep @world |
210 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
211 |
+portage_prefix: releng |
212 |
|
213 |
diff --git a/releases/weekly/specs/amd64/stage2-desktop.spec b/releases/weekly/specs/amd64/stage2-desktop.spec |
214 |
index 949eef8b..634d9fc5 100644 |
215 |
--- a/releases/weekly/specs/amd64/stage2-desktop.spec |
216 |
+++ b/releases/weekly/specs/amd64/stage2-desktop.spec |
217 |
@@ -5,3 +5,4 @@ rel_type: default |
218 |
profile: default/linux/amd64/13.0/desktop |
219 |
snapshot: latest |
220 |
source_subpath: default/stage1-amd64-latest |
221 |
+portage_prefix: releng |
222 |
|
223 |
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec |
224 |
index e98da51b..f94a22ae 100644 |
225 |
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec |
226 |
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec |
227 |
@@ -8,3 +8,4 @@ source_subpath: default/stage1-amd64-nomultilib-latest |
228 |
compression_mode: pixz_x |
229 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
230 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
231 |
+portage_prefix: releng |
232 |
|
233 |
diff --git a/releases/weekly/specs/amd64/stage2-systemd.spec b/releases/weekly/specs/amd64/stage2-systemd.spec |
234 |
index 3a083ced..c8d198f0 100644 |
235 |
--- a/releases/weekly/specs/amd64/stage2-systemd.spec |
236 |
+++ b/releases/weekly/specs/amd64/stage2-systemd.spec |
237 |
@@ -6,3 +6,4 @@ profile: default/linux/amd64/13.0/systemd |
238 |
snapshot: latest |
239 |
source_subpath: default/stage1-amd64-systemd-latest |
240 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
241 |
+portage_prefix: releng |
242 |
|
243 |
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec |
244 |
index 6685dd7b..1cc03cb7 100644 |
245 |
--- a/releases/weekly/specs/amd64/stage2-x32.spec |
246 |
+++ b/releases/weekly/specs/amd64/stage2-x32.spec |
247 |
@@ -8,3 +8,4 @@ source_subpath: default/stage1-x32-latest |
248 |
compression_mode: pixz_x |
249 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
250 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
251 |
+portage_prefix: releng |
252 |
|
253 |
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec |
254 |
index 9f26ee88..b3e31cd6 100644 |
255 |
--- a/releases/weekly/specs/amd64/stage2.spec |
256 |
+++ b/releases/weekly/specs/amd64/stage2.spec |
257 |
@@ -8,3 +8,4 @@ source_subpath: default/stage1-amd64-latest |
258 |
compression_mode: pixz_x |
259 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
260 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
261 |
+portage_prefix: releng |
262 |
|
263 |
diff --git a/releases/weekly/specs/amd64/stage3-desktop.spec b/releases/weekly/specs/amd64/stage3-desktop.spec |
264 |
index bf9519ee..3d068e7d 100644 |
265 |
--- a/releases/weekly/specs/amd64/stage3-desktop.spec |
266 |
+++ b/releases/weekly/specs/amd64/stage3-desktop.spec |
267 |
@@ -5,3 +5,4 @@ rel_type: default |
268 |
profile: default/linux/amd64/13.0/desktop |
269 |
snapshot: latest |
270 |
source_subpath: default/stage2-amd64-desktop-latest |
271 |
+portage_prefix: releng |
272 |
|
273 |
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec |
274 |
index 89ab20d3..4921d27b 100644 |
275 |
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec |
276 |
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec |
277 |
@@ -8,3 +8,4 @@ source_subpath: default/stage2-amd64-nomultilib-latest |
278 |
compression_mode: pixz_x |
279 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
280 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
281 |
+portage_prefix: releng |
282 |
|
283 |
diff --git a/releases/weekly/specs/amd64/stage3-systemd.spec b/releases/weekly/specs/amd64/stage3-systemd.spec |
284 |
index 6bf8b1d6..1e20002f 100644 |
285 |
--- a/releases/weekly/specs/amd64/stage3-systemd.spec |
286 |
+++ b/releases/weekly/specs/amd64/stage3-systemd.spec |
287 |
@@ -6,3 +6,4 @@ profile: default/linux/amd64/13.0/systemd |
288 |
snapshot: latest |
289 |
source_subpath: default/stage2-amd64-systemd-latest |
290 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
291 |
+portage_prefix: releng |
292 |
|
293 |
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec |
294 |
index 9c295e22..639cf562 100644 |
295 |
--- a/releases/weekly/specs/amd64/stage3-x32.spec |
296 |
+++ b/releases/weekly/specs/amd64/stage3-x32.spec |
297 |
@@ -8,3 +8,4 @@ source_subpath: default/stage2-x32-latest |
298 |
compression_mode: pixz_x |
299 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
300 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
301 |
+portage_prefix: releng |
302 |
|
303 |
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec |
304 |
index 07cf6de7..70527bd4 100644 |
305 |
--- a/releases/weekly/specs/amd64/stage3.spec |
306 |
+++ b/releases/weekly/specs/amd64/stage3.spec |
307 |
@@ -8,3 +8,4 @@ source_subpath: default/stage2-amd64-latest |
308 |
compression_mode: pixz_x |
309 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
310 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
311 |
+portage_prefix: releng |
312 |
|
313 |
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec |
314 |
index 69d04974..30e79e9c 100644 |
315 |
--- a/releases/weekly/specs/x86/hardened/stage1.spec |
316 |
+++ b/releases/weekly/specs/x86/hardened/stage1.spec |
317 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
318 |
update_seed: yes |
319 |
update_seed_command: --update --deep @world |
320 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
321 |
+portage_prefix: releng |
322 |
|
323 |
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec |
324 |
index df8b72a8..8fc988c2 100644 |
325 |
--- a/releases/weekly/specs/x86/hardened/stage2.spec |
326 |
+++ b/releases/weekly/specs/x86/hardened/stage2.spec |
327 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-i686-hardened-latest |
328 |
compression_mode: pixz_x |
329 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
330 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
331 |
+portage_prefix: releng |
332 |
|
333 |
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec |
334 |
index 52b786f7..5928d684 100644 |
335 |
--- a/releases/weekly/specs/x86/hardened/stage3.spec |
336 |
+++ b/releases/weekly/specs/x86/hardened/stage3.spec |
337 |
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-i686-hardened-latest |
338 |
compression_mode: pixz_x |
339 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
340 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
341 |
+portage_prefix: releng |
342 |
|
343 |
diff --git a/releases/weekly/specs/x86/i686/hardened/stage2.spec b/releases/weekly/specs/x86/i686/hardened/stage2.spec |
344 |
index f53844d1..29cb8593 100644 |
345 |
--- a/releases/weekly/specs/x86/i686/hardened/stage2.spec |
346 |
+++ b/releases/weekly/specs/x86/i686/hardened/stage2.spec |
347 |
@@ -7,3 +7,4 @@ snapshot: latest |
348 |
source_subpath: hardened/stage1-x86-hardened-latest |
349 |
chost: i686-pc-linux-gnu |
350 |
cflags: -mtune=i686 -O2 -pipe -fforce-addr |
351 |
+portage_prefix: releng |
352 |
|
353 |
diff --git a/releases/weekly/specs/x86/i686/hardened/stage3.spec b/releases/weekly/specs/x86/i686/hardened/stage3.spec |
354 |
index edcefa1d..4f94449e 100644 |
355 |
--- a/releases/weekly/specs/x86/i686/hardened/stage3.spec |
356 |
+++ b/releases/weekly/specs/x86/i686/hardened/stage3.spec |
357 |
@@ -5,3 +5,4 @@ rel_type: hardened |
358 |
profile: hardened/linux/x86 |
359 |
snapshot: latest |
360 |
source_subpath: hardened/stage2-i686-hardened-latest |
361 |
+portage_prefix: releng |
362 |
|
363 |
diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec |
364 |
index cd757316..2838184e 100644 |
365 |
--- a/releases/weekly/specs/x86/i686/stage1.spec |
366 |
+++ b/releases/weekly/specs/x86/i686/stage1.spec |
367 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
368 |
update_seed: yes |
369 |
update_seed_command: --update --deep @world |
370 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
371 |
+portage_prefix: releng |
372 |
|
373 |
diff --git a/releases/weekly/specs/x86/i686/stage2-desktop.spec b/releases/weekly/specs/x86/i686/stage2-desktop.spec |
374 |
index 4e4f5071..4181081d 100644 |
375 |
--- a/releases/weekly/specs/x86/i686/stage2-desktop.spec |
376 |
+++ b/releases/weekly/specs/x86/i686/stage2-desktop.spec |
377 |
@@ -5,3 +5,4 @@ rel_type: default |
378 |
profile: default/linux/x86/13.0/desktop |
379 |
snapshot: latest |
380 |
source_subpath: default/stage1-i686-latest |
381 |
+portage_prefix: releng |
382 |
|
383 |
diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec |
384 |
index a8dfddfe..e1d5cee4 100644 |
385 |
--- a/releases/weekly/specs/x86/i686/stage2.spec |
386 |
+++ b/releases/weekly/specs/x86/i686/stage2.spec |
387 |
@@ -8,3 +8,4 @@ source_subpath: default/stage1-i686-latest |
388 |
compression_mode: pixz_x |
389 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
390 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
391 |
+portage_prefix: releng |
392 |
|
393 |
diff --git a/releases/weekly/specs/x86/i686/stage3-desktop.spec b/releases/weekly/specs/x86/i686/stage3-desktop.spec |
394 |
index 630ca478..cd41af3f 100644 |
395 |
--- a/releases/weekly/specs/x86/i686/stage3-desktop.spec |
396 |
+++ b/releases/weekly/specs/x86/i686/stage3-desktop.spec |
397 |
@@ -5,3 +5,4 @@ rel_type: default |
398 |
profile: default/linux/x86/13.0/desktop |
399 |
snapshot: latest |
400 |
source_subpath: default/stage2-i686-desktop-latest |
401 |
+portage_prefix: releng |
402 |
|
403 |
diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec |
404 |
index 43100aab..aa32ed87 100644 |
405 |
--- a/releases/weekly/specs/x86/i686/stage3.spec |
406 |
+++ b/releases/weekly/specs/x86/i686/stage3.spec |
407 |
@@ -8,3 +8,4 @@ source_subpath: default/stage2-i686-latest |
408 |
compression_mode: pixz_x |
409 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
410 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
411 |
+portage_prefix: releng |
412 |
|
413 |
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec |
414 |
index a1f4c553..c46c907e 100644 |
415 |
--- a/releases/weekly/specs/x86/stage1.spec |
416 |
+++ b/releases/weekly/specs/x86/stage1.spec |
417 |
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
418 |
update_seed: yes |
419 |
update_seed_command: --update --deep @world |
420 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
421 |
+portage_prefix: releng |
422 |
|
423 |
diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec |
424 |
index 67de4d98..fd5f5907 100644 |
425 |
--- a/releases/weekly/specs/x86/stage2.spec |
426 |
+++ b/releases/weekly/specs/x86/stage2.spec |
427 |
@@ -8,3 +8,4 @@ source_subpath: default/stage1-i486-latest |
428 |
compression_mode: pixz_x |
429 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
430 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
431 |
+portage_prefix: releng |
432 |
|
433 |
diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec |
434 |
index 18eeb14a..3c47485e 100644 |
435 |
--- a/releases/weekly/specs/x86/stage3.spec |
436 |
+++ b/releases/weekly/specs/x86/stage3.spec |
437 |
@@ -8,3 +8,4 @@ source_subpath: default/stage2-i486-latest |
438 |
compression_mode: pixz_x |
439 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
440 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/stages |
441 |
+portage_prefix: releng |