Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/i686/, tools/, releases/weekly/specs/amd64/, ...
Date: Tue, 26 Apr 2016 22:35:53
Message-Id: 1461709676.67beeebbdfde802793662553f804c74b965e4813.jmbsvicetto@gentoo
1 commit: 67beeebbdfde802793662553f804c74b965e4813
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 22:27:56 2016 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 22:27:56 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=67beeebb
7
8 Stop using hardcoded paths for the releng repo.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 .../weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 2 +-
13 releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 2 +-
14 .../weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 4 ++--
15 releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 4 ++--
16 releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec | 2 +-
17 .../weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec | 2 +-
18 releases/weekly/specs/amd64/hardened/stage1-selinux.spec | 2 +-
19 releases/weekly/specs/amd64/hardened/stage1.spec | 2 +-
20 releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec | 2 +-
21 .../weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec | 2 +-
22 releases/weekly/specs/amd64/hardened/stage2-selinux.spec | 2 +-
23 releases/weekly/specs/amd64/hardened/stage2.spec | 2 +-
24 releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec | 2 +-
25 .../weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec | 2 +-
26 releases/weekly/specs/amd64/hardened/stage3-selinux.spec | 2 +-
27 releases/weekly/specs/amd64/hardened/stage3.spec | 2 +-
28 releases/weekly/specs/amd64/hardened/stage4-cloud.spec | 10 +++++-----
29 releases/weekly/specs/amd64/hardened/stage4-minimal.spec | 10 +++++-----
30 .../weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec | 10 +++++-----
31 .../weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 10 +++++-----
32 releases/weekly/specs/amd64/installcd-stage1.spec | 2 +-
33 releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 4 ++--
34 releases/weekly/specs/amd64/livecd-stage2.spec | 8 ++++----
35 releases/weekly/specs/amd64/livedvd-stage2.spec | 8 ++++----
36 releases/weekly/specs/amd64/stage1-nomultilib.spec | 2 +-
37 releases/weekly/specs/amd64/stage1-systemd.spec | 2 +-
38 releases/weekly/specs/amd64/stage1-x32.spec | 2 +-
39 releases/weekly/specs/amd64/stage1.spec | 2 +-
40 releases/weekly/specs/amd64/stage2-nomultilib.spec | 2 +-
41 releases/weekly/specs/amd64/stage2-systemd.spec | 2 +-
42 releases/weekly/specs/amd64/stage2-x32.spec | 2 +-
43 releases/weekly/specs/amd64/stage2.spec | 2 +-
44 releases/weekly/specs/amd64/stage3-nomultilib.spec | 2 +-
45 releases/weekly/specs/amd64/stage3-systemd.spec | 2 +-
46 releases/weekly/specs/amd64/stage3-x32.spec | 2 +-
47 releases/weekly/specs/amd64/stage3.spec | 2 +-
48 releases/weekly/specs/amd64/stage4-cloud.spec | 8 ++++----
49 releases/weekly/specs/amd64/stage4-minimal.spec | 8 ++++----
50 releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec | 8 ++++----
51 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec | 8 ++++----
52 releases/weekly/specs/amd64/stage4-systemd.spec | 8 ++++----
53 releases/weekly/specs/x86/hardened/admincd-stage1.spec | 2 +-
54 releases/weekly/specs/x86/hardened/admincd-stage2.spec | 4 ++--
55 .../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +-
56 releases/weekly/specs/x86/hardened/stage1.spec | 2 +-
57 releases/weekly/specs/x86/hardened/stage2.spec | 2 +-
58 releases/weekly/specs/x86/hardened/stage3.spec | 2 +-
59 releases/weekly/specs/x86/i686/livecd-stage2.spec | 8 ++++----
60 releases/weekly/specs/x86/i686/livedvd-stage2.spec | 8 ++++----
61 releases/weekly/specs/x86/i686/stage1.spec | 2 +-
62 releases/weekly/specs/x86/i686/stage2.spec | 2 +-
63 releases/weekly/specs/x86/i686/stage3.spec | 2 +-
64 releases/weekly/specs/x86/installcd-stage1.spec | 2 +-
65 releases/weekly/specs/x86/installcd-stage2-minimal.spec | 4 ++--
66 releases/weekly/specs/x86/stage1.spec | 2 +-
67 releases/weekly/specs/x86/stage2.spec | 2 +-
68 releases/weekly/specs/x86/stage3.spec | 2 +-
69 tools/catalyst-auto | 1 +
70 58 files changed, 106 insertions(+), 105 deletions(-)
71
72 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
73 index a3abe6c..041d5fa 100644
74 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
75 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
76 @@ -5,7 +5,7 @@ rel_type: hardened
77 profile: hardened/linux/amd64/selinux
78 snapshot: latest
79 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
80 -portage_confdir: /release/releng/releases/weekly/portage/isos
81 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
82
83 livecd/use:
84 deprecated
85
86 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
87 index 4566717..f5b7467 100644
88 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
89 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
90 @@ -5,7 +5,7 @@ rel_type: hardened
91 profile: hardened/linux/amd64
92 snapshot: latest
93 source_subpath: hardened/stage3-amd64-hardened-latest
94 -portage_confdir: /release/releng/releases/weekly/portage/isos
95 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
96
97 livecd/use:
98 deprecated
99
100 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
101 index 6538459..32f5f5a 100644
102 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
103 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
104 @@ -5,7 +5,7 @@ rel_type: hardened
105 profile: hardened/linux/amd64/selinux
106 snapshot: latest
107 source_subpath: hardened/livecd-stage1-amd64-latest-selinux
108 -portage_confdir: /release/releng/releases/weekly/portage/isos
109 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
110
111 livecd/bootargs: dokeymap
112 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
113 @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
114 boot/kernel: gentoo
115
116 boot/kernel/gentoo/sources: hardened-sources
117 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
118 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
119 boot/kernel/gentoo/use:
120 -*
121 alsa
122
123 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
124 index e52ed35..3c6601d 100644
125 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
126 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
127 @@ -5,7 +5,7 @@ rel_type: hardened
128 profile: hardened/linux/amd64
129 snapshot: latest
130 source_subpath: hardened/livecd-stage1-amd64-latest
131 -portage_confdir: /release/releng/releases/weekly/portage/isos
132 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
133
134 livecd/bootargs: dokeymap
135 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
136 @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
137 boot/kernel: gentoo
138
139 boot/kernel/gentoo/sources: hardened-sources
140 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.18.9.config
141 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.18.9.config
142 boot/kernel/gentoo/use:
143 -*
144 alsa
145
146 diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
147 index 2a7f348..15361fd 100644
148 --- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
149 +++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
150 @@ -7,4 +7,4 @@ snapshot: latest
151 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
152 update_seed: yes
153 update_seed_command: --update --deep @world
154 -portage_confdir: /release/releng/releases/weekly/portage/stages
155 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
156
157 diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
158 index 3da83f9..ea0466a 100644
159 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
160 +++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
161 @@ -7,4 +7,4 @@ snapshot: latest
162 source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest
163 update_seed: yes
164 update_seed_command: --update --deep @world
165 -portage_confdir: /release/releng/releases/weekly/portage/stages
166 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
167
168 diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
169 index 43ddd75..90ad40f 100644
170 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
171 +++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
172 @@ -7,4 +7,4 @@ snapshot: latest
173 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
174 update_seed: yes
175 update_seed_command: --update --deep @world
176 -portage_confdir: /release/releng/releases/weekly/portage/stages
177 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
178
179 diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
180 index d19ece9..a02e843 100644
181 --- a/releases/weekly/specs/amd64/hardened/stage1.spec
182 +++ b/releases/weekly/specs/amd64/hardened/stage1.spec
183 @@ -7,4 +7,4 @@ snapshot: latest
184 source_subpath: hardened/stage3-amd64-hardened-latest
185 update_seed: yes
186 update_seed_command: --update --deep @world
187 -portage_confdir: /release/releng/releases/weekly/portage/stages
188 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
189
190 diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
191 index 4855de7..2977a67 100644
192 --- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
193 +++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
194 @@ -5,4 +5,4 @@ rel_type: hardened
195 profile: hardened/linux/amd64/no-multilib
196 snapshot: latest
197 source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest
198 -portage_confdir: /release/releng/releases/weekly/portage/stages
199 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
200
201 diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
202 index 67b25ae..c753eaa 100644
203 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
204 +++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
205 @@ -5,4 +5,4 @@ rel_type: hardened
206 profile: hardened/linux/amd64/no-multilib/selinux
207 snapshot: latest
208 source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest
209 -portage_confdir: /release/releng/releases/weekly/portage/stages
210 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
211
212 diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
213 index 3dcfb4e..ee93a45 100644
214 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
215 +++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
216 @@ -5,4 +5,4 @@ rel_type: hardened
217 profile: hardened/linux/amd64/selinux
218 snapshot: latest
219 source_subpath: hardened/stage1-amd64-hardened-selinux-latest
220 -portage_confdir: /release/releng/releases/weekly/portage/stages
221 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
222
223 diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
224 index 319d6e6..f81cfa5 100644
225 --- a/releases/weekly/specs/amd64/hardened/stage2.spec
226 +++ b/releases/weekly/specs/amd64/hardened/stage2.spec
227 @@ -5,4 +5,4 @@ rel_type: hardened
228 profile: hardened/linux/amd64
229 snapshot: latest
230 source_subpath: hardened/stage1-amd64-hardened-latest
231 -portage_confdir: /release/releng/releases/weekly/portage/stages
232 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
233
234 diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
235 index dbd1a59..82f38ff 100644
236 --- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
237 +++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
238 @@ -5,4 +5,4 @@ rel_type: hardened
239 profile: hardened/linux/amd64/no-multilib
240 snapshot: latest
241 source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest
242 -portage_confdir: /release/releng/releases/weekly/portage/stages
243 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
244
245 diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
246 index c064480..28a52a4 100644
247 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
248 +++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
249 @@ -5,4 +5,4 @@ rel_type: hardened
250 profile: hardened/linux/amd64/no-multilib/selinux
251 snapshot: latest
252 source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest
253 -portage_confdir: /release/releng/releases/weekly/portage/stages
254 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
255
256 diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
257 index ce34c62..1615cf6 100644
258 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
259 +++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
260 @@ -5,4 +5,4 @@ rel_type: hardened
261 profile: hardened/linux/amd64/selinux
262 snapshot: latest
263 source_subpath: hardened/stage2-amd64-hardened-selinux-latest
264 -portage_confdir: /release/releng/releases/weekly/portage/stages
265 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
266
267 diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
268 index 36a6bfa..99e7722 100644
269 --- a/releases/weekly/specs/amd64/hardened/stage3.spec
270 +++ b/releases/weekly/specs/amd64/hardened/stage3.spec
271 @@ -5,4 +5,4 @@ rel_type: hardened
272 profile: hardened/linux/amd64
273 snapshot: latest
274 source_subpath: hardened/stage2-amd64-hardened-latest
275 -portage_confdir: /release/releng/releases/weekly/portage/stages
276 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
277
278 diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
279 index 62152fd..1769ca3 100644
280 --- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
281 +++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
282 @@ -5,7 +5,7 @@ rel_type: hardened
283 profile: hardened/linux/amd64
284 snapshot: latest
285 source_subpath: hardened/stage3-amd64-hardened-latest
286 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
287 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
288
289 stage4/use:
290 bash-completion
291 @@ -36,8 +36,8 @@ stage4/packages:
292 sys-devel/bc
293 sys-power/acpid
294 sys-process/cronie
295 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
296 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
297 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
298 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
299 stage4/rcadd:
300 acpid|default
301 cloud-config|default
302 @@ -53,7 +53,7 @@ stage4/rcadd:
303
304 boot/kernel: gentoo
305 boot/kernel/gentoo/sources: hardened-sources
306 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
307 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
308 boot/kernel/gentoo/extraversion: openstack
309 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
310
311 @@ -69,7 +69,7 @@ stage4/empty:
312 /usr/src
313 /var/cache/edb/dep
314 /var/cache/genkernel
315 - /var/cache/portage/distfiles
316 + /var/cache/portage/distfiles
317 /var/empty
318 /var/run
319 /var/state
320
321 diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
322 index 594df10..ad31032 100644
323 --- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
324 +++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
325 @@ -5,7 +5,7 @@ rel_type: hardened
326 profile: hardened/linux/amd64
327 snapshot: latest
328 source_subpath: hardened/stage3-amd64-hardened-latest
329 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
330 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
331
332 stage4/use:
333 bindist
334 @@ -27,8 +27,8 @@ stage4/packages:
335 sys-apps/lsb-release
336 sys-devel/bc
337 sys-power/acpid
338 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
339 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
340 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
341 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
342 stage4/rcadd:
343 acpid|default
344 net.lo|default
345 @@ -37,7 +37,7 @@ stage4/rcadd:
346
347 boot/kernel: gentoo
348 boot/kernel/gentoo/sources: hardened-sources
349 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
350 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
351 boot/kernel/gentoo/extraversion: openstack
352 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
353
354 @@ -53,7 +53,7 @@ stage4/empty:
355 /usr/src
356 /var/cache/edb/dep
357 /var/cache/genkernel
358 - /var/cache/portage/distfiles
359 + /var/cache/portage/distfiles
360 /var/empty
361 /var/run
362 /var/state
363
364 diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
365 index 826b0b7..a57f813 100644
366 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
367 +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
368 @@ -5,7 +5,7 @@ rel_type: hardened
369 profile: hardened/linux/amd64/no-multilib
370 snapshot: latest
371 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
372 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
373 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
374
375 stage4/use:
376 bash-completion
377 @@ -36,8 +36,8 @@ stage4/packages:
378 sys-devel/bc
379 sys-power/acpid
380 sys-process/cronie
381 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
382 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
383 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
384 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
385 stage4/rcadd:
386 acpid|default
387 cloud-config|default
388 @@ -53,7 +53,7 @@ stage4/rcadd:
389
390 boot/kernel: gentoo
391 boot/kernel/gentoo/sources: hardened-sources
392 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
393 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
394 boot/kernel/gentoo/extraversion: openstack
395 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
396
397 @@ -69,7 +69,7 @@ stage4/empty:
398 /usr/src
399 /var/cache/edb/dep
400 /var/cache/genkernel
401 - /var/cache/portage/distfiles
402 + /var/cache/portage/distfiles
403 /var/empty
404 /var/run
405 /var/state
406
407 diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
408 index ca441e7..bb1e6aa 100644
409 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
410 +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
411 @@ -5,7 +5,7 @@ rel_type: hardened
412 profile: hardened/linux/amd64/no-multilib
413 snapshot: latest
414 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
415 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
416 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
417
418 stage4/use:
419 bindist
420 @@ -27,8 +27,8 @@ stage4/packages:
421 sys-apps/lsb-release
422 sys-devel/bc
423 sys-power/acpid
424 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
425 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
426 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
427 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
428 stage4/rcadd:
429 acpid|default
430 net.lo|default
431 @@ -37,7 +37,7 @@ stage4/rcadd:
432
433 boot/kernel: gentoo
434 boot/kernel/gentoo/sources: hardened-sources
435 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
436 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
437 boot/kernel/gentoo/extraversion: openstack
438 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
439
440 @@ -53,7 +53,7 @@ stage4/empty:
441 /usr/src
442 /var/cache/edb/dep
443 /var/cache/genkernel
444 - /var/cache/portage/distfiles
445 + /var/cache/portage/distfiles
446 /var/empty
447 /var/run
448 /var/state
449
450 diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
451 index 1d30cde..94eb7bd 100644
452 --- a/releases/weekly/specs/amd64/installcd-stage1.spec
453 +++ b/releases/weekly/specs/amd64/installcd-stage1.spec
454 @@ -5,7 +5,7 @@ rel_type: default
455 profile: default/linux/amd64/13.0/no-multilib
456 snapshot: latest
457 source_subpath: default/stage3-amd64-latest
458 -portage_confdir: /release/releng/releases/weekly/portage/isos
459 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
460
461 livecd/use:
462 deprecated
463
464 diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
465 index deae00b..ab56ab7 100644
466 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
467 +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
468 @@ -5,7 +5,7 @@ rel_type: default
469 profile: default/linux/amd64/13.0/no-multilib
470 snapshot: latest
471 source_subpath: default/livecd-stage1-amd64-latest
472 -portage_confdir: /release/releng/releases/weekly/portage/isos
473 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
474
475 livecd/bootargs: dokeymap
476 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
477 @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
478 boot/kernel: gentoo
479
480 boot/kernel/gentoo/sources: gentoo-sources
481 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
482 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/installcd-3.18.12.config
483 boot/kernel/gentoo/use:
484 -*
485 alsa
486
487 diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec
488 index 364f1e3..5a22e60 100644
489 --- a/releases/weekly/specs/amd64/livecd-stage2.spec
490 +++ b/releases/weekly/specs/amd64/livecd-stage2.spec
491 @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
492
493 livecd/bootargs: dokeymap
494 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
495 -livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
496 +livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
497 livecd/fstype: squashfs
498 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
499 livecd/iso: livecd-amd64-installer-latest.iso
500 @@ -17,12 +17,12 @@ livecd/volid: Gentoo Linux latest amd64 LiveCD
501 livecd/xsession: xfce
502 livecd/xdm: gdm
503
504 -livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livecd
505 -livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
506 +livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livecd
507 +livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
508
509 boot/kernel: gentoo
510 boot/kernel/gentoo/sources: gentoo-sources
511 -boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
512 +boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/amd64/livecd-2.6.24.config
513 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
514 boot/kernel/gentoo/packages:
515 media-libs/alsa-oss
516
517 diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec
518 index 7b0fcc4..666ef20 100644
519 --- a/releases/weekly/specs/amd64/livedvd-stage2.spec
520 +++ b/releases/weekly/specs/amd64/livedvd-stage2.spec
521 @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
522
523 livecd/bootargs: dokeymap
524 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
525 -livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
526 +livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
527 livecd/fstype: squashfs
528 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
529 livecd/iso: livedvd-amd64-installer-latest.iso
530 @@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux AMD64 LiveDVD
531 livecd/xdm: gdm
532 livecd/xsession: xfce
533
534 -livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livedvd
535 -livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
536 +livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livedvd
537 +livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
538
539 boot/kernel: gentoo
540
541 boot/kernel/gentoo/sources: gentoo-sources
542 -boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
543 +boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/amd64/livecd-2.6.24.config
544 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
545 boot/kernel/gentoo/packages:
546 media-libs/alsa-oss
547
548 diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
549 index 32dbed1..b6f28ba 100644
550 --- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
551 +++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec
552 @@ -7,4 +7,4 @@ snapshot: latest
553 source_subpath: default/stage3-amd64-nomultilib-latest
554 update_seed: yes
555 update_seed_command: --update --deep @world
556 -portage_confdir: /release/releng/releases/weekly/portage/stages
557 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
558
559 diff --git a/releases/weekly/specs/amd64/stage1-systemd.spec b/releases/weekly/specs/amd64/stage1-systemd.spec
560 index ba536da..8bad257 100644
561 --- a/releases/weekly/specs/amd64/stage1-systemd.spec
562 +++ b/releases/weekly/specs/amd64/stage1-systemd.spec
563 @@ -7,4 +7,4 @@ snapshot: latest
564 source_subpath: default/stage3-amd64-latest
565 update_seed: yes
566 update_seed_command: --update --deep @world
567 -portage_confdir: /release/releng/releases/weekly/portage/stages
568 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
569
570 diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
571 index e9177da..55ebcc9 100644
572 --- a/releases/weekly/specs/amd64/stage1-x32.spec
573 +++ b/releases/weekly/specs/amd64/stage1-x32.spec
574 @@ -7,4 +7,4 @@ snapshot: latest
575 source_subpath: default/stage3-x32-latest
576 update_seed: yes
577 update_seed_command: --update --deep @world
578 -portage_confdir: /release/releng/releases/weekly/portage/stages
579 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
580
581 diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
582 index 3391887..0a006e2 100644
583 --- a/releases/weekly/specs/amd64/stage1.spec
584 +++ b/releases/weekly/specs/amd64/stage1.spec
585 @@ -7,4 +7,4 @@ snapshot: latest
586 source_subpath: default/stage3-amd64-latest
587 update_seed: yes
588 update_seed_command: --update --deep @world
589 -portage_confdir: /release/releng/releases/weekly/portage/stages
590 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
591
592 diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
593 index f22357d..c07365c 100644
594 --- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
595 +++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
596 @@ -5,4 +5,4 @@ rel_type: default
597 profile: default/linux/amd64/13.0/no-multilib
598 snapshot: latest
599 source_subpath: default/stage1-amd64-nomultilib-latest
600 -portage_confdir: /release/releng/releases/weekly/portage/stages
601 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
602
603 diff --git a/releases/weekly/specs/amd64/stage2-systemd.spec b/releases/weekly/specs/amd64/stage2-systemd.spec
604 index 7e978b7..3a083ce 100644
605 --- a/releases/weekly/specs/amd64/stage2-systemd.spec
606 +++ b/releases/weekly/specs/amd64/stage2-systemd.spec
607 @@ -5,4 +5,4 @@ rel_type: default
608 profile: default/linux/amd64/13.0/systemd
609 snapshot: latest
610 source_subpath: default/stage1-amd64-systemd-latest
611 -portage_confdir: /release/releng/releases/weekly/portage/stages
612 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
613
614 diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
615 index 5bb3d7f..aab5cdc 100644
616 --- a/releases/weekly/specs/amd64/stage2-x32.spec
617 +++ b/releases/weekly/specs/amd64/stage2-x32.spec
618 @@ -5,4 +5,4 @@ rel_type: default
619 profile: default/linux/amd64/13.0/x32
620 snapshot: latest
621 source_subpath: default/stage1-x32-latest
622 -portage_confdir: /release/releng/releases/weekly/portage/stages
623 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
624
625 diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
626 index 87779c2..937539f 100644
627 --- a/releases/weekly/specs/amd64/stage2.spec
628 +++ b/releases/weekly/specs/amd64/stage2.spec
629 @@ -5,4 +5,4 @@ rel_type: default
630 profile: default/linux/amd64/13.0
631 snapshot: latest
632 source_subpath: default/stage1-amd64-latest
633 -portage_confdir: /release/releng/releases/weekly/portage/stages
634 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
635
636 diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
637 index f714797..3eaaf0c 100644
638 --- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
639 +++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
640 @@ -5,4 +5,4 @@ rel_type: default
641 profile: default/linux/amd64/13.0/no-multilib
642 snapshot: latest
643 source_subpath: default/stage2-amd64-nomultilib-latest
644 -portage_confdir: /release/releng/releases/weekly/portage/stages
645 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
646
647 diff --git a/releases/weekly/specs/amd64/stage3-systemd.spec b/releases/weekly/specs/amd64/stage3-systemd.spec
648 index 42a70ad..6bf8b1d 100644
649 --- a/releases/weekly/specs/amd64/stage3-systemd.spec
650 +++ b/releases/weekly/specs/amd64/stage3-systemd.spec
651 @@ -5,4 +5,4 @@ rel_type: default
652 profile: default/linux/amd64/13.0/systemd
653 snapshot: latest
654 source_subpath: default/stage2-amd64-systemd-latest
655 -portage_confdir: /release/releng/releases/weekly/portage/stages
656 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
657
658 diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
659 index dcd5728..d2f6734 100644
660 --- a/releases/weekly/specs/amd64/stage3-x32.spec
661 +++ b/releases/weekly/specs/amd64/stage3-x32.spec
662 @@ -5,4 +5,4 @@ rel_type: default
663 profile: default/linux/amd64/13.0/x32
664 snapshot: latest
665 source_subpath: default/stage2-x32-latest
666 -portage_confdir: /release/releng/releases/weekly/portage/stages
667 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
668
669 diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
670 index 012e16d..3b1c6e0 100644
671 --- a/releases/weekly/specs/amd64/stage3.spec
672 +++ b/releases/weekly/specs/amd64/stage3.spec
673 @@ -5,4 +5,4 @@ rel_type: default
674 profile: default/linux/amd64/13.0
675 snapshot: latest
676 source_subpath: default/stage2-amd64-latest
677 -portage_confdir: /release/releng/releases/weekly/portage/stages
678 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
679
680 diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
681 index 013ec2e..11ad820 100644
682 --- a/releases/weekly/specs/amd64/stage4-cloud.spec
683 +++ b/releases/weekly/specs/amd64/stage4-cloud.spec
684 @@ -5,7 +5,7 @@ rel_type: default
685 profile: default/linux/amd64/13.0
686 snapshot: latest
687 source_subpath: default/stage3-amd64-latest
688 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
689 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
690
691 stage4/use:
692 bash-completion
693 @@ -38,8 +38,8 @@ stage4/packages:
694 sys-devel/bc
695 sys-power/acpid
696 sys-process/cronie
697 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
698 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
699 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
700 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
701 stage4/rcadd:
702 acpid|default
703 cloud-config|default
704 @@ -55,7 +55,7 @@ stage4/rcadd:
705
706 boot/kernel: gentoo
707 boot/kernel/gentoo/sources: gentoo-sources
708 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
709 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
710 boot/kernel/gentoo/extraversion: openstack
711 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
712
713
714 diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
715 index a550659..1e87741 100644
716 --- a/releases/weekly/specs/amd64/stage4-minimal.spec
717 +++ b/releases/weekly/specs/amd64/stage4-minimal.spec
718 @@ -5,7 +5,7 @@ rel_type: default
719 profile: default/linux/amd64/13.0
720 snapshot: latest
721 source_subpath: default/stage3-amd64-latest
722 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
723 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
724
725 stage4/use:
726 bindist
727 @@ -27,8 +27,8 @@ stage4/packages:
728 sys-apps/lsb-release
729 sys-devel/bc
730 sys-power/acpid
731 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
732 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
733 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
734 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
735 stage4/rcadd:
736 acpid|default
737 net.lo|default
738 @@ -37,7 +37,7 @@ stage4/rcadd:
739
740 boot/kernel: gentoo
741 boot/kernel/gentoo/sources: gentoo-sources
742 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
743 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
744 boot/kernel/gentoo/extraversion: openstack
745 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
746
747
748 diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
749 index 2121557..53bf8d1 100644
750 --- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
751 +++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
752 @@ -5,7 +5,7 @@ rel_type: default
753 profile: default/linux/amd64/13.0/no-multilib
754 snapshot: latest
755 source_subpath: default/stage3-amd64-nomultilib-latest
756 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
757 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
758
759 stage4/use:
760 bash-completion
761 @@ -36,8 +36,8 @@ stage4/packages:
762 sys-devel/bc
763 sys-power/acpid
764 sys-process/cronie
765 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
766 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
767 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
768 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
769 stage4/rcadd:
770 acpid|default
771 cloud-config|default
772 @@ -53,7 +53,7 @@ stage4/rcadd:
773
774 boot/kernel: gentoo
775 boot/kernel/gentoo/sources: gentoo-sources
776 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
777 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
778 boot/kernel/gentoo/extraversion: openstack
779 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
780
781
782 diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
783 index 1cd5e28..0e99031 100644
784 --- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
785 +++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
786 @@ -5,7 +5,7 @@ rel_type: default
787 profile: default/linux/amd64/13.0/no-multilib
788 snapshot: latest
789 source_subpath: default/stage3-amd64-nomultilib-latest
790 -portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
791 +portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
792
793 stage4/use:
794 bindist
795 @@ -27,8 +27,8 @@ stage4/packages:
796 sys-apps/lsb-release
797 sys-devel/bc
798 sys-power/acpid
799 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
800 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
801 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
802 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
803 stage4/rcadd:
804 acpid|default
805 net.lo|default
806 @@ -37,7 +37,7 @@ stage4/rcadd:
807
808 boot/kernel: gentoo
809 boot/kernel/gentoo/sources: gentoo-sources
810 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
811 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
812 boot/kernel/gentoo/extraversion: openstack
813 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
814
815
816 diff --git a/releases/weekly/specs/amd64/stage4-systemd.spec b/releases/weekly/specs/amd64/stage4-systemd.spec
817 index a309742..c680cb7 100644
818 --- a/releases/weekly/specs/amd64/stage4-systemd.spec
819 +++ b/releases/weekly/specs/amd64/stage4-systemd.spec
820 @@ -5,7 +5,7 @@ rel_type: default
821 profile: default/linux/amd64/13.0/systemd
822 snapshot: latest
823 source_subpath: default/stage3-amd64-latest
824 -portage_confdir: /release/releng/releases/weekly/portage/systemd-stages
825 +portage_confdir: @REPO_DIR@/releases/weekly/portage/systemd-stages
826
827 stage4/use:
828 bash-completion
829 @@ -38,8 +38,8 @@ stage4/packages:
830 sys-devel/bc
831 sys-power/acpid
832 sys-process/cronie
833 -stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
834 -stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
835 +stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
836 +stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
837 stage4/rcadd:
838 acpid|default
839 cloud-config|default
840 @@ -55,7 +55,7 @@ stage4/rcadd:
841
842 boot/kernel: gentoo
843 boot/kernel/gentoo/sources: gentoo-sources
844 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
845 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
846 boot/kernel/gentoo/extraversion: openstack
847 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
848
849
850 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
851 index 7b899f4..132cec0 100644
852 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
853 +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
854 @@ -5,7 +5,7 @@ rel_type: hardened
855 profile: hardened/linux/x86
856 snapshot: latest
857 source_subpath: hardened/stage3-i686-hardened-latest
858 -portage_confdir: /release/releng/releases/weekly/portage/isos
859 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
860
861 livecd/use:
862 deprecated
863
864 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
865 index 6eb5228..f2dfd20 100644
866 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
867 +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
868 @@ -5,7 +5,7 @@ rel_type: hardened
869 profile: hardened/linux/x86
870 snapshot: latest
871 source_subpath: hardened/livecd-stage1-x86-latest
872 -portage_confdir: /release/releng/releases/weekly/portage/isos
873 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
874
875 livecd/bootargs: dokeymap
876 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
877 @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
878 boot/kernel: gentoo
879
880 boot/kernel/gentoo/sources: hardened-sources
881 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/admincd-3.18.9.config
882 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
883 boot/kernel/gentoo/use:
884 -*
885 alsa
886
887 diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
888 index 1d1d98c..8d8f312 100644
889 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
890 +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
891 @@ -17,7 +17,7 @@ livecd/volid: Gentoo Linux x86 latest
892 boot/kernel: gentoo
893
894 boot/kernel/gentoo/sources: hardened-sources
895 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
896 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
897 boot/kernel/gentoo/use:
898 -*
899 alsa
900
901 diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
902 index b8c3a4e..34cf3f6 100644
903 --- a/releases/weekly/specs/x86/hardened/stage1.spec
904 +++ b/releases/weekly/specs/x86/hardened/stage1.spec
905 @@ -7,4 +7,4 @@ snapshot: latest
906 source_subpath: hardened/stage3-i686-hardened-latest
907 update_seed: yes
908 update_seed_command: --update --deep @world
909 -portage_confdir: /release/releng/releases/weekly/portage/stages
910 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
911
912 diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
913 index 78ff0e1..2142ad0 100644
914 --- a/releases/weekly/specs/x86/hardened/stage2.spec
915 +++ b/releases/weekly/specs/x86/hardened/stage2.spec
916 @@ -5,4 +5,4 @@ rel_type: hardened
917 profile: hardened/linux/x86
918 snapshot: latest
919 source_subpath: hardened/stage1-i686-hardened-latest
920 -portage_confdir: /release/releng/releases/weekly/portage/stages
921 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
922
923 diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
924 index 368cf00..6a7300e 100644
925 --- a/releases/weekly/specs/x86/hardened/stage3.spec
926 +++ b/releases/weekly/specs/x86/hardened/stage3.spec
927 @@ -5,4 +5,4 @@ rel_type: hardened
928 profile: hardened/linux/x86
929 snapshot: latest
930 source_subpath: hardened/stage2-i686-hardened-latest
931 -portage_confdir: /release/releng/releases/weekly/portage/stages
932 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
933
934 diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec
935 index 196eeee..baa769e 100644
936 --- a/releases/weekly/specs/x86/i686/livecd-stage2.spec
937 +++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec
938 @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-i686-installer-latest
939
940 livecd/bootargs: dokeymap
941 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
942 -livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
943 +livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
944 livecd/fstype: squashfs
945 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
946 livecd/iso: livecd-i686-installer-latest.iso
947 @@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux latest x86 LiveCD
948 livecd/xdm: gdm
949 livecd/xsession: xfce
950
951 -livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livecd
952 -livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
953 +livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livecd
954 +livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
955
956 boot/kernel: gentoo
957
958 boot/kernel/gentoo/sources: gentoo-sources
959 -boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/livecd-2.6.24.config
960 +boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/livecd-2.6.24.config
961 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
962 boot/kernel/gentoo/packages:
963 media-libs/alsa-oss
964
965 diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
966 index ccfa18f..f906ce3 100644
967 --- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec
968 +++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
969 @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-i686-installer-latest
970
971 livecd/bootargs: dokeymap
972 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
973 -livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
974 +livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
975 livecd/fstype: squashfs
976 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
977 livecd/iso: livedvd-i686-installer-latest.iso
978 @@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux latest x86 LiveDVD
979 livecd/xdm: gdm
980 livecd/xsession: xfce
981
982 -livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livedvd
983 -livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
984 +livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livedvd
985 +livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
986
987 boot/kernel: gentoo
988
989 boot/kernel/gentoo/sources: gentoo-sources
990 -boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/livecd-2.6.24.config
991 +boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/livecd-2.6.24.config
992 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
993 boot/kernel/gentoo/packages:
994 app-laptop/laptop-mode-tools
995
996 diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
997 index ba069d0..dd4aa33 100644
998 --- a/releases/weekly/specs/x86/i686/stage1.spec
999 +++ b/releases/weekly/specs/x86/i686/stage1.spec
1000 @@ -7,4 +7,4 @@ snapshot: latest
1001 source_subpath: default/stage3-i686-latest
1002 update_seed: yes
1003 update_seed_command: --update --deep @world
1004 -portage_confdir: /release/releng/releases/weekly/portage/stages
1005 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1006
1007 diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
1008 index 81b05b5..0feca2d 100644
1009 --- a/releases/weekly/specs/x86/i686/stage2.spec
1010 +++ b/releases/weekly/specs/x86/i686/stage2.spec
1011 @@ -5,4 +5,4 @@ rel_type: default
1012 profile: default/linux/x86/13.0
1013 snapshot: latest
1014 source_subpath: default/stage1-i686-latest
1015 -portage_confdir: /release/releng/releases/weekly/portage/stages
1016 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1017
1018 diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
1019 index 94baedd..e15ae51 100644
1020 --- a/releases/weekly/specs/x86/i686/stage3.spec
1021 +++ b/releases/weekly/specs/x86/i686/stage3.spec
1022 @@ -5,4 +5,4 @@ rel_type: default
1023 profile: default/linux/x86/13.0
1024 snapshot: latest
1025 source_subpath: default/stage2-i686-latest
1026 -portage_confdir: /release/releng/releases/weekly/portage/stages
1027 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1028
1029 diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec
1030 index 58afaf9..b1110e8 100644
1031 --- a/releases/weekly/specs/x86/installcd-stage1.spec
1032 +++ b/releases/weekly/specs/x86/installcd-stage1.spec
1033 @@ -5,7 +5,7 @@ rel_type: default
1034 profile: default/linux/x86/13.0
1035 snapshot: latest
1036 source_subpath: default/stage3-i486-latest
1037 -portage_confdir: /release/releng/releases/weekly/portage/isos
1038 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1039
1040 livecd/use:
1041 deprecated
1042
1043 diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
1044 index 9b42398..e2b81b7 100644
1045 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
1046 +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
1047 @@ -5,7 +5,7 @@ rel_type: default
1048 profile: default/linux/x86/13.0
1049 snapshot: latest
1050 source_subpath: default/livecd-stage1-x86-latest
1051 -portage_confdir: /release/releng/releases/weekly/portage/isos
1052 +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1053
1054 livecd/bootargs: dokeymap
1055 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
1056 @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
1057 boot/kernel: gentoo
1058
1059 boot/kernel/gentoo/sources: gentoo-sources
1060 -boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/installcd-3.18.12.config
1061 +boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/installcd-3.18.12.config
1062 boot/kernel/gentoo/use:
1063 -*
1064 alsa
1065
1066 diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
1067 index caad715..d060250 100644
1068 --- a/releases/weekly/specs/x86/stage1.spec
1069 +++ b/releases/weekly/specs/x86/stage1.spec
1070 @@ -7,4 +7,4 @@ snapshot: latest
1071 source_subpath: default/stage3-i486-latest
1072 update_seed: yes
1073 update_seed_command: --update --deep @world
1074 -portage_confdir: /release/releng/releases/weekly/portage/stages
1075 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1076
1077 diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
1078 index 0bfab17..99c94e7 100644
1079 --- a/releases/weekly/specs/x86/stage2.spec
1080 +++ b/releases/weekly/specs/x86/stage2.spec
1081 @@ -5,4 +5,4 @@ rel_type: default
1082 profile: default/linux/x86/13.0
1083 snapshot: latest
1084 source_subpath: default/stage1-i486-latest
1085 -portage_confdir: /release/releng/releases/weekly/portage/stages
1086 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1087
1088 diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
1089 index 54c8c78..dbb44c6 100644
1090 --- a/releases/weekly/specs/x86/stage3.spec
1091 +++ b/releases/weekly/specs/x86/stage3.spec
1092 @@ -5,4 +5,4 @@ rel_type: default
1093 profile: default/linux/x86/13.0
1094 snapshot: latest
1095 source_subpath: default/stage2-i486-latest
1096 -portage_confdir: /release/releng/releases/weekly/portage/stages
1097 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1098
1099 diff --git a/tools/catalyst-auto b/tools/catalyst-auto
1100 index 00d8250..823b9f2 100755
1101 --- a/tools/catalyst-auto
1102 +++ b/tools/catalyst-auto
1103 @@ -266,6 +266,7 @@ for i in $(find -name '*.spec'); do
1104 sed -i \
1105 -e "s:@DATESTAMP@:${DATESTAMP}:g" \
1106 -e "s:@GITDIR@:${GITDIR}:g" \
1107 + -e "s:@REPO_DIR@:${REPO_DIR}:g" \
1108 "${i}"
1109 done