Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/overlays/common/overlay/livecd/snapshots/, ...
Date: Wed, 29 Apr 2020 23:20:24
Message-Id: 1588123082.8407af57f5aa9c95c0e6e6ae726361b3c578627d.mattst88@gentoo
1 commit: 8407af57f5aa9c95c0e6e6ae726361b3c578627d
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 01:16:29 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 01:18:02 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8407af57
7
8 Remove weekly directory
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 releases/{weekly => }/kconfig/alpha/installcd-4.14.83.config | 0
13 releases/{weekly => }/kconfig/alpha/installcd-4.14.83.nolsa.config | 0
14 releases/{weekly => }/kconfig/amd64/admincd-3.11.7.config | 0
15 releases/{weekly => }/kconfig/amd64/admincd-3.14.5-r2.config | 0
16 releases/{weekly => }/kconfig/amd64/admincd-3.15.8.config | 0
17 releases/{weekly => }/kconfig/amd64/admincd-3.18.9.config | 0
18 releases/{weekly => }/kconfig/amd64/admincd-3.8.3-selinux.config | 0
19 releases/{weekly => }/kconfig/amd64/admincd-3.8.3.config | 0
20 releases/{weekly => }/kconfig/amd64/admincd-3.9.5.config | 0
21 releases/{weekly => }/kconfig/amd64/admincd-4.14.83.config | 0
22 releases/{weekly => }/kconfig/amd64/admincd-4.4.8-r1-selinux.config | 0
23 releases/{weekly => }/kconfig/amd64/admincd-4.4.8-r1.config | 0
24 releases/{weekly => }/kconfig/amd64/cloud-amd64-gentoo.config | 0
25 releases/{weekly => }/kconfig/amd64/cloud-amd64-hardened.config | 0
26 releases/{weekly => }/kconfig/amd64/installcd-3.10.17.config | 0
27 releases/{weekly => }/kconfig/amd64/installcd-3.12.21.config | 0
28 releases/{weekly => }/kconfig/amd64/installcd-3.16.5.config | 0
29 releases/{weekly => }/kconfig/amd64/installcd-3.18.12.config | 0
30 releases/{weekly => }/kconfig/amd64/installcd-3.7.4.config | 0
31 releases/{weekly => }/kconfig/amd64/installcd-3.8.13.config | 0
32 releases/{weekly => }/kconfig/amd64/installcd-4.14.52.config | 0
33 releases/{weekly => }/kconfig/amd64/installcd-4.4.6.config | 0
34 releases/{weekly => }/kconfig/amd64/livecd-2.6.24.config | 0
35 releases/{weekly => }/kconfig/arm64/packet-arm64.config | 0
36 releases/{weekly => }/kconfig/hppa/installcd-2.6.24-livecd32.config | 0
37 releases/{weekly => }/kconfig/hppa/installcd-2.6.24-livecd64.config | 0
38 .../kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config | 0
39 .../kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config | 0
40 .../kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config | 0
41 .../kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config | 0
42 releases/{weekly => }/kconfig/ia64/installcd-3.8.13.config | 0
43 releases/{weekly => }/kconfig/powerpc/installcd-ibm-4.19.config | 0
44 .../{weekly => }/kconfig/powerpc/installcd-ppc32apple-4.19.config | 0
45 .../{weekly => }/kconfig/powerpc/installcd-ppc64apple-4.19.config | 0
46 releases/{weekly => }/kconfig/s390/netboot64.config | 0
47 releases/{weekly => }/kconfig/sparc/installcd-3.8.13.config | 0
48 releases/{weekly => }/kconfig/sparc/installcd-4.14.39.config | 0
49 releases/{weekly => }/kconfig/sparc/installcd-4.14.83.config | 0
50 releases/{weekly => }/kconfig/sparc/installcd-4.19.44.config | 0
51 releases/{weekly => }/kconfig/x86/admincd-3.0.config | 0
52 releases/{weekly => }/kconfig/x86/admincd-3.18.9.config | 0
53 releases/{weekly => }/kconfig/x86/admincd-3.2.config | 0
54 releases/{weekly => }/kconfig/x86/admincd-3.4.2.config | 0
55 releases/{weekly => }/kconfig/x86/admincd-3.9.5.config | 0
56 releases/{weekly => }/kconfig/x86/installcd-2.6.24.config | 0
57 releases/{weekly => }/kconfig/x86/installcd-2.6.27.config | 0
58 releases/{weekly => }/kconfig/x86/installcd-2.6.28.config | 0
59 releases/{weekly => }/kconfig/x86/installcd-2.6.31.config | 0
60 releases/{weekly => }/kconfig/x86/installcd-2.6.37.config | 0
61 releases/{weekly => }/kconfig/x86/installcd-2.6.38.config | 0
62 releases/{weekly => }/kconfig/x86/installcd-3.18.12.config | 0
63 releases/{weekly => }/kconfig/x86/installcd-3.4.2.config | 0
64 releases/{weekly => }/kconfig/x86/installcd-3.8.13.config | 0
65 releases/{weekly => }/kconfig/x86/installcd-4.14.52.config | 0
66 releases/{weekly => }/kconfig/x86/livecd-2.6.24.config | 0
67 .../{weekly => }/overlays/common/overlay/installcd/distfiles/README | 0
68 releases/{weekly => }/overlays/common/overlay/installcd/docs/README | 0
69 .../{weekly => }/overlays/common/overlay/installcd/snapshots/README | 0
70 .../{weekly => }/overlays/common/overlay/installcd/stages/README | 0
71 releases/{weekly => }/overlays/common/overlay/livecd/docs/README | 0
72 .../{weekly => }/overlays/common/overlay/livecd/snapshots/README | 0
73 .../{weekly => }/overlays/common/overlay/livedvd/distfiles/README | 0
74 releases/{weekly => }/overlays/common/overlay/livedvd/docs/README | 0
75 .../{weekly => }/overlays/common/overlay/livedvd/snapshots/README | 0
76 releases/{weekly => }/overlays/common/overlay/livedvd/stages/README | 0
77 .../.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml | 0
78 .../overlays/common/root_overlay/home/gentoo/.xscreensaver | 0
79 .../portage/isos/package.accept_keywords/admincd-packages | 0
80 releases/{weekly => }/portage/isos/package.accept_keywords/zfs | 0
81 releases/{weekly => }/portage/isos/package.license/package.license | 0
82 releases/{weekly => }/portage/isos/package.use/admincd-packages | 0
83 releases/{weekly => }/portage/isos/package.use/cifs-utils | 0
84 releases/{weekly => }/portage/isos/package.use/genkernel | 0
85 releases/{weekly => }/portage/isos/package.use/linux-firmware | 0
86 .../{weekly => }/portage/isos/savedconfig/sys-kernel/linux-firmware | 0
87 releases/{weekly => }/portage/stages/package.use/releng/libpcre | 0
88 releases/{weekly => }/portage/stages/package.use/releng/no-filecaps | 0
89 releases/{weekly => }/scripts/cloud-prep.sh | 0
90 releases/{weekly => }/scripts/livecd.sh | 0
91 releases/{weekly => }/specs/alpha/installcd-stage1.spec | 2 +-
92 releases/{weekly => }/specs/alpha/installcd-stage2-minimal.spec | 4 ++--
93 releases/{weekly => }/specs/alpha/netboot/bs.conf | 0
94 releases/{weekly => }/specs/alpha/netboot/cmd | 0
95 releases/{weekly => }/specs/alpha/netboot/config | 0
96 releases/{weekly => }/specs/alpha/netboot/netboot2.spec | 0
97 releases/{weekly => }/specs/alpha/stage1.spec | 2 +-
98 releases/{weekly => }/specs/alpha/stage2.spec | 2 +-
99 releases/{weekly => }/specs/alpha/stage3.spec | 2 +-
100 .../{weekly => }/specs/amd64/hardened/admincd-stage1-selinux.spec | 2 +-
101 releases/{weekly => }/specs/amd64/hardened/admincd-stage1.spec | 2 +-
102 .../{weekly => }/specs/amd64/hardened/admincd-stage2-selinux.spec | 4 ++--
103 releases/{weekly => }/specs/amd64/hardened/admincd-stage2.spec | 4 ++--
104 releases/{weekly => }/specs/amd64/hardened/stage1-nomultilib.spec | 2 +-
105 .../specs/amd64/hardened/stage1-selinux-nomultilib.spec | 2 +-
106 releases/{weekly => }/specs/amd64/hardened/stage1-selinux.spec | 2 +-
107 releases/{weekly => }/specs/amd64/hardened/stage1.spec | 2 +-
108 releases/{weekly => }/specs/amd64/hardened/stage2-nomultilib.spec | 2 +-
109 .../specs/amd64/hardened/stage2-selinux-nomultilib.spec | 2 +-
110 releases/{weekly => }/specs/amd64/hardened/stage2-selinux.spec | 2 +-
111 releases/{weekly => }/specs/amd64/hardened/stage2.spec | 2 +-
112 releases/{weekly => }/specs/amd64/hardened/stage3-nomultilib.spec | 2 +-
113 .../specs/amd64/hardened/stage3-selinux-nomultilib.spec | 2 +-
114 releases/{weekly => }/specs/amd64/hardened/stage3-selinux.spec | 2 +-
115 releases/{weekly => }/specs/amd64/hardened/stage3.spec | 2 +-
116 releases/{weekly => }/specs/amd64/hardened/stage4-minimal.spec | 6 +++---
117 .../specs/amd64/hardened/stage4-nomultilib-minimal.spec | 6 +++---
118 releases/{weekly => }/specs/amd64/installcd-stage1.spec | 2 +-
119 releases/{weekly => }/specs/amd64/installcd-stage2-minimal.spec | 4 ++--
120 releases/{weekly => }/specs/amd64/livecd-stage1.spec | 0
121 releases/{weekly => }/specs/amd64/livecd-stage2.spec | 0
122 releases/{weekly => }/specs/amd64/livedvd-stage1.spec | 0
123 releases/{weekly => }/specs/amd64/livedvd-stage2.spec | 0
124 releases/{weekly => }/specs/amd64/stage1-nomultilib.spec | 2 +-
125 releases/{weekly => }/specs/amd64/stage1-x32.spec | 2 +-
126 releases/{weekly => }/specs/amd64/stage1.spec | 2 +-
127 releases/{weekly => }/specs/amd64/stage2-desktop.spec | 0
128 releases/{weekly => }/specs/amd64/stage2-nomultilib.spec | 2 +-
129 releases/{weekly => }/specs/amd64/stage2-x32.spec | 2 +-
130 releases/{weekly => }/specs/amd64/stage2.spec | 2 +-
131 releases/{weekly => }/specs/amd64/stage3-desktop.spec | 0
132 releases/{weekly => }/specs/amd64/stage3-nomultilib.spec | 2 +-
133 releases/{weekly => }/specs/amd64/stage3-x32.spec | 2 +-
134 releases/{weekly => }/specs/amd64/stage3.spec | 2 +-
135 releases/{weekly => }/specs/amd64/stage4-minimal.spec | 6 +++---
136 releases/{weekly => }/specs/amd64/stage4-nomultilib-minimal.spec | 6 +++---
137 releases/{weekly => }/specs/arm/armeb/stage1.spec | 0
138 releases/{weekly => }/specs/arm/armeb/stage2.spec | 0
139 releases/{weekly => }/specs/arm/armeb/stage3.spec | 0
140 releases/{weekly => }/specs/arm/armv4l/stage1.spec | 0
141 releases/{weekly => }/specs/arm/armv4l/stage2.spec | 0
142 releases/{weekly => }/specs/arm/armv4l/stage3.spec | 0
143 releases/{weekly => }/specs/arm/armv4l/strongarm/stage1.spec | 0
144 releases/{weekly => }/specs/arm/armv4l/strongarm/stage2.spec | 0
145 releases/{weekly => }/specs/arm/armv4l/strongarm/stage3.spec | 0
146 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage1.spec | 0
147 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage2.spec | 0
148 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage3.spec | 0
149 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage1.spec | 0
150 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage2.spec | 0
151 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage3.spec | 0
152 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage1.spec | 0
153 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage2.spec | 0
154 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage3.spec | 0
155 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage1.spec | 0
156 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage2.spec | 0
157 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage3.spec | 0
158 releases/{weekly => }/specs/arm/armv4tl/stage1.spec | 0
159 releases/{weekly => }/specs/arm/armv4tl/stage2.spec | 0
160 releases/{weekly => }/specs/arm/armv4tl/stage3.spec | 0
161 releases/{weekly => }/specs/arm/armv5teb/stage1.spec | 0
162 releases/{weekly => }/specs/arm/armv5teb/stage2.spec | 0
163 releases/{weekly => }/specs/arm/armv5teb/stage3.spec | 0
164 releases/{weekly => }/specs/arm/armv5tejl/stage1.spec | 0
165 releases/{weekly => }/specs/arm/armv5tejl/stage2.spec | 0
166 releases/{weekly => }/specs/arm/armv5tejl/stage3.spec | 0
167 releases/{weekly => }/specs/arm/armv5tel/stage1.spec | 0
168 releases/{weekly => }/specs/arm/armv5tel/stage2.spec | 0
169 releases/{weekly => }/specs/arm/armv5tel/stage3.spec | 0
170 releases/{weekly => }/specs/arm/armv5tl/stage1.spec | 0
171 releases/{weekly => }/specs/arm/armv5tl/stage2.spec | 0
172 releases/{weekly => }/specs/arm/armv5tl/stage3.spec | 0
173 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage1.spec | 0
174 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage2.spec | 0
175 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage3.spec | 0
176 releases/{weekly => }/specs/arm/armv6j/stage1.spec | 0
177 releases/{weekly => }/specs/arm/armv6j/stage2.spec | 0
178 releases/{weekly => }/specs/arm/armv6j/stage3.spec | 0
179 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage1.spec | 0
180 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage2.spec | 0
181 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage3.spec | 0
182 releases/{weekly => }/specs/arm/armv7a/stage1.spec | 0
183 releases/{weekly => }/specs/arm/armv7a/stage2.spec | 0
184 releases/{weekly => }/specs/arm/armv7a/stage3.spec | 0
185 releases/{weekly => }/specs/arm/stage1.spec | 0
186 releases/{weekly => }/specs/arm/stage2.spec | 0
187 releases/{weekly => }/specs/arm/stage3.spec | 0
188 releases/{weekly => }/specs/arm64/stage1.spec | 2 +-
189 releases/{weekly => }/specs/arm64/stage2.spec | 2 +-
190 releases/{weekly => }/specs/arm64/stage3.spec | 2 +-
191 releases/{weekly => }/specs/arm64/stage4-minimal.spec | 6 +++---
192 releases/{weekly => }/specs/hppa/hppa1.1/stage1.spec | 2 +-
193 releases/{weekly => }/specs/hppa/hppa1.1/stage2.spec | 2 +-
194 releases/{weekly => }/specs/hppa/hppa1.1/stage3.spec | 2 +-
195 releases/{weekly => }/specs/hppa/hppa2.0/stage1.spec | 2 +-
196 releases/{weekly => }/specs/hppa/hppa2.0/stage2.spec | 2 +-
197 releases/{weekly => }/specs/hppa/hppa2.0/stage3.spec | 2 +-
198 releases/{weekly => }/specs/hppa/installcd-stage1.spec | 2 +-
199 releases/{weekly => }/specs/hppa/installcd-stage2-minimal.spec | 2 +-
200 releases/{weekly => }/specs/hppa/installcd-stage2-universal.spec | 0
201 releases/{weekly => }/specs/hppa/netboot2-hppa32.spec | 2 +-
202 releases/{weekly => }/specs/hppa/netboot2-hppa64.spec | 2 +-
203 releases/{weekly => }/specs/ia64/installcd-stage1.spec | 2 +-
204 releases/{weekly => }/specs/ia64/installcd-stage2-minimal.spec | 2 +-
205 releases/{weekly => }/specs/ia64/stage1.spec | 2 +-
206 releases/{weekly => }/specs/ia64/stage2.spec | 2 +-
207 releases/{weekly => }/specs/ia64/stage3.spec | 2 +-
208 releases/{weekly => }/specs/mips/mips3/netboot.spec | 0
209 releases/{weekly => }/specs/mips/mips3/stage1.spec | 0
210 releases/{weekly => }/specs/mips/mips3/stage2.spec | 0
211 releases/{weekly => }/specs/mips/mips3/stage3.spec | 0
212 releases/{weekly => }/specs/mips/mips4/stage1.spec | 0
213 releases/{weekly => }/specs/mips/mips4/stage2.spec | 0
214 releases/{weekly => }/specs/mips/mips4/stage3.spec | 0
215 releases/{weekly => }/specs/ppc/ppc32/g4/stage2.spec | 0
216 releases/{weekly => }/specs/ppc/ppc32/g4/stage3.spec | 0
217 releases/{weekly => }/specs/ppc/ppc32/installcd-stage1.spec | 2 +-
218 releases/{weekly => }/specs/ppc/ppc32/installcd-stage2-minimal.spec | 2 +-
219 releases/{weekly => }/specs/ppc/ppc32/stage1.spec | 2 +-
220 releases/{weekly => }/specs/ppc/ppc32/stage2.spec | 2 +-
221 releases/{weekly => }/specs/ppc/ppc32/stage3.spec | 2 +-
222 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage1.spec | 0
223 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage2.spec | 0
224 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage3.spec | 0
225 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage1.spec | 0
226 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage2.spec | 0
227 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage3.spec | 0
228 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage1.spec | 0
229 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage2.spec | 0
230 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage3.spec | 0
231 releases/{weekly => }/specs/ppc/ppc64/stage1-32ul.spec | 2 +-
232 releases/{weekly => }/specs/ppc/ppc64/stage1.spec | 2 +-
233 releases/{weekly => }/specs/ppc/ppc64/stage2-32ul.spec | 2 +-
234 releases/{weekly => }/specs/ppc/ppc64/stage2.spec | 2 +-
235 releases/{weekly => }/specs/ppc/ppc64/stage3-32ul.spec | 2 +-
236 releases/{weekly => }/specs/ppc/ppc64/stage3.spec | 2 +-
237 releases/{weekly => }/specs/ppc/ppc64le/stage1.spec | 2 +-
238 releases/{weekly => }/specs/ppc/ppc64le/stage3.spec | 2 +-
239 releases/{weekly => }/specs/s390/s390/netboot/misc/gentoo.exec | 0
240 releases/{weekly => }/specs/s390/s390/netboot/misc/gentoo.parmfile | 0
241 releases/{weekly => }/specs/s390/s390/netboot/netboot.spec | 2 +-
242 .../s390/netboot/portage/package.accept_keywords/gentoo-sources | 0
243 .../specs/s390/s390/netboot/portage/package.use/genkernel | 0
244 .../s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch | 0
245 releases/{weekly => }/specs/s390/s390/stage1.spec | 2 +-
246 releases/{weekly => }/specs/s390/s390/stage2.spec | 2 +-
247 releases/{weekly => }/specs/s390/s390/stage3.spec | 2 +-
248 releases/{weekly => }/specs/s390/s390x/netboot/misc/gentoo.exec | 0
249 releases/{weekly => }/specs/s390/s390x/netboot/misc/gentoo.parmfile | 0
250 releases/{weekly => }/specs/s390/s390x/netboot/netboot.spec | 2 +-
251 .../s390x/netboot/portage/package.accept_keywords/gentoo-sources | 0
252 .../specs/s390/s390x/netboot/portage/package.use/genkernel | 0
253 .../s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch | 0
254 releases/{weekly => }/specs/s390/s390x/stage1.spec | 2 +-
255 releases/{weekly => }/specs/s390/s390x/stage2.spec | 2 +-
256 releases/{weekly => }/specs/s390/s390x/stage3.spec | 2 +-
257 releases/{weekly => }/specs/sh/sh4/stage1.spec | 0
258 releases/{weekly => }/specs/sh/sh4/stage2.spec | 0
259 releases/{weekly => }/specs/sh/sh4/stage3.spec | 0
260 releases/{weekly => }/specs/sh/sh4a/stage1.spec | 0
261 releases/{weekly => }/specs/sh/sh4a/stage2.spec | 0
262 releases/{weekly => }/specs/sh/sh4a/stage3.spec | 0
263 releases/{weekly => }/specs/sparc/sparc/stage1.spec | 2 +-
264 releases/{weekly => }/specs/sparc/sparc/stage2.spec | 2 +-
265 releases/{weekly => }/specs/sparc/sparc/stage3.spec | 2 +-
266 releases/{weekly => }/specs/sparc/sparc/systemd-stage1.spec | 2 +-
267 releases/{weekly => }/specs/sparc/sparc/systemd-stage2.spec | 2 +-
268 releases/{weekly => }/specs/sparc/sparc/systemd-stage3.spec | 2 +-
269 releases/{weekly => }/specs/sparc/sparc64/installcd-stage1.spec | 2 +-
270 .../{weekly => }/specs/sparc/sparc64/installcd-stage2-minimal.spec | 4 ++--
271 releases/{weekly => }/specs/sparc/sparc64/multilib/stage1.spec | 0
272 releases/{weekly => }/specs/sparc/sparc64/multilib/stage2.spec | 0
273 releases/{weekly => }/specs/sparc/sparc64/multilib/stage3.spec | 0
274 releases/{weekly => }/specs/sparc/sparc64/netboot.spec | 0
275 releases/{weekly => }/specs/sparc/sparc64/stage1.spec | 2 +-
276 releases/{weekly => }/specs/sparc/sparc64/stage2.spec | 2 +-
277 releases/{weekly => }/specs/sparc/sparc64/stage3.spec | 2 +-
278 releases/{weekly => }/specs/sparc/sparc64/systemd-stage1.spec | 2 +-
279 releases/{weekly => }/specs/sparc/sparc64/systemd-stage2.spec | 2 +-
280 releases/{weekly => }/specs/sparc/sparc64/systemd-stage3.spec | 2 +-
281 releases/{weekly => }/specs/x86/hardened/admincd-stage1.spec | 2 +-
282 releases/{weekly => }/specs/x86/hardened/admincd-stage2.spec | 4 ++--
283 releases/{weekly => }/specs/x86/hardened/installcd-stage1.spec | 0
284 .../{weekly => }/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +-
285 releases/{weekly => }/specs/x86/hardened/stage1.spec | 2 +-
286 releases/{weekly => }/specs/x86/hardened/stage2.spec | 2 +-
287 releases/{weekly => }/specs/x86/hardened/stage3.spec | 2 +-
288 releases/{weekly => }/specs/x86/i686/hardened/stage2.spec | 0
289 releases/{weekly => }/specs/x86/i686/hardened/stage3.spec | 0
290 releases/{weekly => }/specs/x86/i686/livecd-stage1.spec | 0
291 releases/{weekly => }/specs/x86/i686/livecd-stage2.spec | 0
292 releases/{weekly => }/specs/x86/i686/livedvd-stage1.spec | 0
293 releases/{weekly => }/specs/x86/i686/livedvd-stage2.spec | 0
294 releases/{weekly => }/specs/x86/i686/stage1.spec | 2 +-
295 releases/{weekly => }/specs/x86/i686/stage2-desktop.spec | 0
296 releases/{weekly => }/specs/x86/i686/stage2.spec | 2 +-
297 releases/{weekly => }/specs/x86/i686/stage3-desktop.spec | 0
298 releases/{weekly => }/specs/x86/i686/stage3.spec | 2 +-
299 releases/{weekly => }/specs/x86/installcd-stage1.spec | 2 +-
300 releases/{weekly => }/specs/x86/installcd-stage2-minimal.spec | 4 ++--
301 releases/{weekly => }/specs/x86/stage1.spec | 2 +-
302 releases/{weekly => }/specs/x86/stage2.spec | 2 +-
303 releases/{weekly => }/specs/x86/stage3.spec | 2 +-
304 tools-musl/stage4-hardened-amd64.spec | 2 +-
305 tools-systemd/stage4-amd64.spec | 4 ++--
306 tools/catalyst-auto-alpha.conf | 4 ++--
307 tools/catalyst-auto-amd64-experimental.conf | 4 ++--
308 tools/catalyst-auto-amd64.conf | 4 ++--
309 tools/catalyst-auto-arm64.conf | 4 ++--
310 tools/catalyst-auto-armv4tl.conf | 4 ++--
311 tools/catalyst-auto-armv5tel.conf | 4 ++--
312 tools/catalyst-auto-armv6j.conf | 4 ++--
313 tools/catalyst-auto-armv6j_hardfp.conf | 4 ++--
314 tools/catalyst-auto-armv7a.conf | 4 ++--
315 tools/catalyst-auto-armv7a_hardfp.conf | 4 ++--
316 tools/catalyst-auto-hppa.conf | 4 ++--
317 tools/catalyst-auto-ia64.conf | 4 ++--
318 tools/catalyst-auto-ppc.conf | 4 ++--
319 tools/catalyst-auto-ppc64le.conf | 4 ++--
320 tools/catalyst-auto-s390.conf | 4 ++--
321 tools/catalyst-auto-s390x.conf | 4 ++--
322 tools/catalyst-auto-sparc64.conf | 4 ++--
323 tools/catalyst-auto-x86-experimental.conf | 4 ++--
324 tools/catalyst-auto-x86.conf | 4 ++--
325 313 files changed, 162 insertions(+), 162 deletions(-)
326
327 diff --git a/releases/weekly/kconfig/alpha/installcd-4.14.83.config b/releases/kconfig/alpha/installcd-4.14.83.config
328 similarity index 100%
329 rename from releases/weekly/kconfig/alpha/installcd-4.14.83.config
330 rename to releases/kconfig/alpha/installcd-4.14.83.config
331
332 diff --git a/releases/weekly/kconfig/alpha/installcd-4.14.83.nolsa.config b/releases/kconfig/alpha/installcd-4.14.83.nolsa.config
333 similarity index 100%
334 rename from releases/weekly/kconfig/alpha/installcd-4.14.83.nolsa.config
335 rename to releases/kconfig/alpha/installcd-4.14.83.nolsa.config
336
337 diff --git a/releases/weekly/kconfig/amd64/admincd-3.11.7.config b/releases/kconfig/amd64/admincd-3.11.7.config
338 similarity index 100%
339 rename from releases/weekly/kconfig/amd64/admincd-3.11.7.config
340 rename to releases/kconfig/amd64/admincd-3.11.7.config
341
342 diff --git a/releases/weekly/kconfig/amd64/admincd-3.14.5-r2.config b/releases/kconfig/amd64/admincd-3.14.5-r2.config
343 similarity index 100%
344 rename from releases/weekly/kconfig/amd64/admincd-3.14.5-r2.config
345 rename to releases/kconfig/amd64/admincd-3.14.5-r2.config
346
347 diff --git a/releases/weekly/kconfig/amd64/admincd-3.15.8.config b/releases/kconfig/amd64/admincd-3.15.8.config
348 similarity index 100%
349 rename from releases/weekly/kconfig/amd64/admincd-3.15.8.config
350 rename to releases/kconfig/amd64/admincd-3.15.8.config
351
352 diff --git a/releases/weekly/kconfig/amd64/admincd-3.18.9.config b/releases/kconfig/amd64/admincd-3.18.9.config
353 similarity index 100%
354 rename from releases/weekly/kconfig/amd64/admincd-3.18.9.config
355 rename to releases/kconfig/amd64/admincd-3.18.9.config
356
357 diff --git a/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config b/releases/kconfig/amd64/admincd-3.8.3-selinux.config
358 similarity index 100%
359 rename from releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
360 rename to releases/kconfig/amd64/admincd-3.8.3-selinux.config
361
362 diff --git a/releases/weekly/kconfig/amd64/admincd-3.8.3.config b/releases/kconfig/amd64/admincd-3.8.3.config
363 similarity index 100%
364 rename from releases/weekly/kconfig/amd64/admincd-3.8.3.config
365 rename to releases/kconfig/amd64/admincd-3.8.3.config
366
367 diff --git a/releases/weekly/kconfig/amd64/admincd-3.9.5.config b/releases/kconfig/amd64/admincd-3.9.5.config
368 similarity index 100%
369 rename from releases/weekly/kconfig/amd64/admincd-3.9.5.config
370 rename to releases/kconfig/amd64/admincd-3.9.5.config
371
372 diff --git a/releases/weekly/kconfig/amd64/admincd-4.14.83.config b/releases/kconfig/amd64/admincd-4.14.83.config
373 similarity index 100%
374 rename from releases/weekly/kconfig/amd64/admincd-4.14.83.config
375 rename to releases/kconfig/amd64/admincd-4.14.83.config
376
377 diff --git a/releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config b/releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config
378 similarity index 100%
379 rename from releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config
380 rename to releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config
381
382 diff --git a/releases/weekly/kconfig/amd64/admincd-4.4.8-r1.config b/releases/kconfig/amd64/admincd-4.4.8-r1.config
383 similarity index 100%
384 rename from releases/weekly/kconfig/amd64/admincd-4.4.8-r1.config
385 rename to releases/kconfig/amd64/admincd-4.4.8-r1.config
386
387 diff --git a/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config b/releases/kconfig/amd64/cloud-amd64-gentoo.config
388 similarity index 100%
389 rename from releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
390 rename to releases/kconfig/amd64/cloud-amd64-gentoo.config
391
392 diff --git a/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config b/releases/kconfig/amd64/cloud-amd64-hardened.config
393 similarity index 100%
394 rename from releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
395 rename to releases/kconfig/amd64/cloud-amd64-hardened.config
396
397 diff --git a/releases/weekly/kconfig/amd64/installcd-3.10.17.config b/releases/kconfig/amd64/installcd-3.10.17.config
398 similarity index 100%
399 rename from releases/weekly/kconfig/amd64/installcd-3.10.17.config
400 rename to releases/kconfig/amd64/installcd-3.10.17.config
401
402 diff --git a/releases/weekly/kconfig/amd64/installcd-3.12.21.config b/releases/kconfig/amd64/installcd-3.12.21.config
403 similarity index 100%
404 rename from releases/weekly/kconfig/amd64/installcd-3.12.21.config
405 rename to releases/kconfig/amd64/installcd-3.12.21.config
406
407 diff --git a/releases/weekly/kconfig/amd64/installcd-3.16.5.config b/releases/kconfig/amd64/installcd-3.16.5.config
408 similarity index 100%
409 rename from releases/weekly/kconfig/amd64/installcd-3.16.5.config
410 rename to releases/kconfig/amd64/installcd-3.16.5.config
411
412 diff --git a/releases/weekly/kconfig/amd64/installcd-3.18.12.config b/releases/kconfig/amd64/installcd-3.18.12.config
413 similarity index 100%
414 rename from releases/weekly/kconfig/amd64/installcd-3.18.12.config
415 rename to releases/kconfig/amd64/installcd-3.18.12.config
416
417 diff --git a/releases/weekly/kconfig/amd64/installcd-3.7.4.config b/releases/kconfig/amd64/installcd-3.7.4.config
418 similarity index 100%
419 rename from releases/weekly/kconfig/amd64/installcd-3.7.4.config
420 rename to releases/kconfig/amd64/installcd-3.7.4.config
421
422 diff --git a/releases/weekly/kconfig/amd64/installcd-3.8.13.config b/releases/kconfig/amd64/installcd-3.8.13.config
423 similarity index 100%
424 rename from releases/weekly/kconfig/amd64/installcd-3.8.13.config
425 rename to releases/kconfig/amd64/installcd-3.8.13.config
426
427 diff --git a/releases/weekly/kconfig/amd64/installcd-4.14.52.config b/releases/kconfig/amd64/installcd-4.14.52.config
428 similarity index 100%
429 rename from releases/weekly/kconfig/amd64/installcd-4.14.52.config
430 rename to releases/kconfig/amd64/installcd-4.14.52.config
431
432 diff --git a/releases/weekly/kconfig/amd64/installcd-4.4.6.config b/releases/kconfig/amd64/installcd-4.4.6.config
433 similarity index 100%
434 rename from releases/weekly/kconfig/amd64/installcd-4.4.6.config
435 rename to releases/kconfig/amd64/installcd-4.4.6.config
436
437 diff --git a/releases/weekly/kconfig/amd64/livecd-2.6.24.config b/releases/kconfig/amd64/livecd-2.6.24.config
438 similarity index 100%
439 rename from releases/weekly/kconfig/amd64/livecd-2.6.24.config
440 rename to releases/kconfig/amd64/livecd-2.6.24.config
441
442 diff --git a/releases/weekly/kconfig/arm64/packet-arm64.config b/releases/kconfig/arm64/packet-arm64.config
443 similarity index 100%
444 rename from releases/weekly/kconfig/arm64/packet-arm64.config
445 rename to releases/kconfig/arm64/packet-arm64.config
446
447 diff --git a/releases/weekly/kconfig/hppa/installcd-2.6.24-livecd32.config b/releases/kconfig/hppa/installcd-2.6.24-livecd32.config
448 similarity index 100%
449 rename from releases/weekly/kconfig/hppa/installcd-2.6.24-livecd32.config
450 rename to releases/kconfig/hppa/installcd-2.6.24-livecd32.config
451
452 diff --git a/releases/weekly/kconfig/hppa/installcd-2.6.24-livecd64.config b/releases/kconfig/hppa/installcd-2.6.24-livecd64.config
453 similarity index 100%
454 rename from releases/weekly/kconfig/hppa/installcd-2.6.24-livecd64.config
455 rename to releases/kconfig/hppa/installcd-2.6.24-livecd64.config
456
457 diff --git a/releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config b/releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config
458 similarity index 100%
459 rename from releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config
460 rename to releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config
461
462 diff --git a/releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config b/releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config
463 similarity index 100%
464 rename from releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config
465 rename to releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config
466
467 diff --git a/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config b/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
468 similarity index 100%
469 rename from releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
470 rename to releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
471
472 diff --git a/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config b/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
473 similarity index 100%
474 rename from releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
475 rename to releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
476
477 diff --git a/releases/weekly/kconfig/ia64/installcd-3.8.13.config b/releases/kconfig/ia64/installcd-3.8.13.config
478 similarity index 100%
479 rename from releases/weekly/kconfig/ia64/installcd-3.8.13.config
480 rename to releases/kconfig/ia64/installcd-3.8.13.config
481
482 diff --git a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config b/releases/kconfig/powerpc/installcd-ibm-4.19.config
483 similarity index 100%
484 rename from releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config
485 rename to releases/kconfig/powerpc/installcd-ibm-4.19.config
486
487 diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config
488 similarity index 100%
489 rename from releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config
490 rename to releases/kconfig/powerpc/installcd-ppc32apple-4.19.config
491
492 diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config
493 similarity index 100%
494 rename from releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config
495 rename to releases/kconfig/powerpc/installcd-ppc64apple-4.19.config
496
497 diff --git a/releases/weekly/kconfig/s390/netboot64.config b/releases/kconfig/s390/netboot64.config
498 similarity index 100%
499 rename from releases/weekly/kconfig/s390/netboot64.config
500 rename to releases/kconfig/s390/netboot64.config
501
502 diff --git a/releases/weekly/kconfig/sparc/installcd-3.8.13.config b/releases/kconfig/sparc/installcd-3.8.13.config
503 similarity index 100%
504 rename from releases/weekly/kconfig/sparc/installcd-3.8.13.config
505 rename to releases/kconfig/sparc/installcd-3.8.13.config
506
507 diff --git a/releases/weekly/kconfig/sparc/installcd-4.14.39.config b/releases/kconfig/sparc/installcd-4.14.39.config
508 similarity index 100%
509 rename from releases/weekly/kconfig/sparc/installcd-4.14.39.config
510 rename to releases/kconfig/sparc/installcd-4.14.39.config
511
512 diff --git a/releases/weekly/kconfig/sparc/installcd-4.14.83.config b/releases/kconfig/sparc/installcd-4.14.83.config
513 similarity index 100%
514 rename from releases/weekly/kconfig/sparc/installcd-4.14.83.config
515 rename to releases/kconfig/sparc/installcd-4.14.83.config
516
517 diff --git a/releases/weekly/kconfig/sparc/installcd-4.19.44.config b/releases/kconfig/sparc/installcd-4.19.44.config
518 similarity index 100%
519 rename from releases/weekly/kconfig/sparc/installcd-4.19.44.config
520 rename to releases/kconfig/sparc/installcd-4.19.44.config
521
522 diff --git a/releases/weekly/kconfig/x86/admincd-3.0.config b/releases/kconfig/x86/admincd-3.0.config
523 similarity index 100%
524 rename from releases/weekly/kconfig/x86/admincd-3.0.config
525 rename to releases/kconfig/x86/admincd-3.0.config
526
527 diff --git a/releases/weekly/kconfig/x86/admincd-3.18.9.config b/releases/kconfig/x86/admincd-3.18.9.config
528 similarity index 100%
529 rename from releases/weekly/kconfig/x86/admincd-3.18.9.config
530 rename to releases/kconfig/x86/admincd-3.18.9.config
531
532 diff --git a/releases/weekly/kconfig/x86/admincd-3.2.config b/releases/kconfig/x86/admincd-3.2.config
533 similarity index 100%
534 rename from releases/weekly/kconfig/x86/admincd-3.2.config
535 rename to releases/kconfig/x86/admincd-3.2.config
536
537 diff --git a/releases/weekly/kconfig/x86/admincd-3.4.2.config b/releases/kconfig/x86/admincd-3.4.2.config
538 similarity index 100%
539 rename from releases/weekly/kconfig/x86/admincd-3.4.2.config
540 rename to releases/kconfig/x86/admincd-3.4.2.config
541
542 diff --git a/releases/weekly/kconfig/x86/admincd-3.9.5.config b/releases/kconfig/x86/admincd-3.9.5.config
543 similarity index 100%
544 rename from releases/weekly/kconfig/x86/admincd-3.9.5.config
545 rename to releases/kconfig/x86/admincd-3.9.5.config
546
547 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.24.config b/releases/kconfig/x86/installcd-2.6.24.config
548 similarity index 100%
549 rename from releases/weekly/kconfig/x86/installcd-2.6.24.config
550 rename to releases/kconfig/x86/installcd-2.6.24.config
551
552 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.27.config b/releases/kconfig/x86/installcd-2.6.27.config
553 similarity index 100%
554 rename from releases/weekly/kconfig/x86/installcd-2.6.27.config
555 rename to releases/kconfig/x86/installcd-2.6.27.config
556
557 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.28.config b/releases/kconfig/x86/installcd-2.6.28.config
558 similarity index 100%
559 rename from releases/weekly/kconfig/x86/installcd-2.6.28.config
560 rename to releases/kconfig/x86/installcd-2.6.28.config
561
562 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.31.config b/releases/kconfig/x86/installcd-2.6.31.config
563 similarity index 100%
564 rename from releases/weekly/kconfig/x86/installcd-2.6.31.config
565 rename to releases/kconfig/x86/installcd-2.6.31.config
566
567 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.37.config b/releases/kconfig/x86/installcd-2.6.37.config
568 similarity index 100%
569 rename from releases/weekly/kconfig/x86/installcd-2.6.37.config
570 rename to releases/kconfig/x86/installcd-2.6.37.config
571
572 diff --git a/releases/weekly/kconfig/x86/installcd-2.6.38.config b/releases/kconfig/x86/installcd-2.6.38.config
573 similarity index 100%
574 rename from releases/weekly/kconfig/x86/installcd-2.6.38.config
575 rename to releases/kconfig/x86/installcd-2.6.38.config
576
577 diff --git a/releases/weekly/kconfig/x86/installcd-3.18.12.config b/releases/kconfig/x86/installcd-3.18.12.config
578 similarity index 100%
579 rename from releases/weekly/kconfig/x86/installcd-3.18.12.config
580 rename to releases/kconfig/x86/installcd-3.18.12.config
581
582 diff --git a/releases/weekly/kconfig/x86/installcd-3.4.2.config b/releases/kconfig/x86/installcd-3.4.2.config
583 similarity index 100%
584 rename from releases/weekly/kconfig/x86/installcd-3.4.2.config
585 rename to releases/kconfig/x86/installcd-3.4.2.config
586
587 diff --git a/releases/weekly/kconfig/x86/installcd-3.8.13.config b/releases/kconfig/x86/installcd-3.8.13.config
588 similarity index 100%
589 rename from releases/weekly/kconfig/x86/installcd-3.8.13.config
590 rename to releases/kconfig/x86/installcd-3.8.13.config
591
592 diff --git a/releases/weekly/kconfig/x86/installcd-4.14.52.config b/releases/kconfig/x86/installcd-4.14.52.config
593 similarity index 100%
594 rename from releases/weekly/kconfig/x86/installcd-4.14.52.config
595 rename to releases/kconfig/x86/installcd-4.14.52.config
596
597 diff --git a/releases/weekly/kconfig/x86/livecd-2.6.24.config b/releases/kconfig/x86/livecd-2.6.24.config
598 similarity index 100%
599 rename from releases/weekly/kconfig/x86/livecd-2.6.24.config
600 rename to releases/kconfig/x86/livecd-2.6.24.config
601
602 diff --git a/releases/weekly/overlays/common/overlay/installcd/distfiles/README b/releases/overlays/common/overlay/installcd/distfiles/README
603 similarity index 100%
604 rename from releases/weekly/overlays/common/overlay/installcd/distfiles/README
605 rename to releases/overlays/common/overlay/installcd/distfiles/README
606
607 diff --git a/releases/weekly/overlays/common/overlay/installcd/docs/README b/releases/overlays/common/overlay/installcd/docs/README
608 similarity index 100%
609 rename from releases/weekly/overlays/common/overlay/installcd/docs/README
610 rename to releases/overlays/common/overlay/installcd/docs/README
611
612 diff --git a/releases/weekly/overlays/common/overlay/installcd/snapshots/README b/releases/overlays/common/overlay/installcd/snapshots/README
613 similarity index 100%
614 rename from releases/weekly/overlays/common/overlay/installcd/snapshots/README
615 rename to releases/overlays/common/overlay/installcd/snapshots/README
616
617 diff --git a/releases/weekly/overlays/common/overlay/installcd/stages/README b/releases/overlays/common/overlay/installcd/stages/README
618 similarity index 100%
619 rename from releases/weekly/overlays/common/overlay/installcd/stages/README
620 rename to releases/overlays/common/overlay/installcd/stages/README
621
622 diff --git a/releases/weekly/overlays/common/overlay/livecd/docs/README b/releases/overlays/common/overlay/livecd/docs/README
623 similarity index 100%
624 rename from releases/weekly/overlays/common/overlay/livecd/docs/README
625 rename to releases/overlays/common/overlay/livecd/docs/README
626
627 diff --git a/releases/weekly/overlays/common/overlay/livecd/snapshots/README b/releases/overlays/common/overlay/livecd/snapshots/README
628 similarity index 100%
629 rename from releases/weekly/overlays/common/overlay/livecd/snapshots/README
630 rename to releases/overlays/common/overlay/livecd/snapshots/README
631
632 diff --git a/releases/weekly/overlays/common/overlay/livedvd/distfiles/README b/releases/overlays/common/overlay/livedvd/distfiles/README
633 similarity index 100%
634 rename from releases/weekly/overlays/common/overlay/livedvd/distfiles/README
635 rename to releases/overlays/common/overlay/livedvd/distfiles/README
636
637 diff --git a/releases/weekly/overlays/common/overlay/livedvd/docs/README b/releases/overlays/common/overlay/livedvd/docs/README
638 similarity index 100%
639 rename from releases/weekly/overlays/common/overlay/livedvd/docs/README
640 rename to releases/overlays/common/overlay/livedvd/docs/README
641
642 diff --git a/releases/weekly/overlays/common/overlay/livedvd/snapshots/README b/releases/overlays/common/overlay/livedvd/snapshots/README
643 similarity index 100%
644 rename from releases/weekly/overlays/common/overlay/livedvd/snapshots/README
645 rename to releases/overlays/common/overlay/livedvd/snapshots/README
646
647 diff --git a/releases/weekly/overlays/common/overlay/livedvd/stages/README b/releases/overlays/common/overlay/livedvd/stages/README
648 similarity index 100%
649 rename from releases/weekly/overlays/common/overlay/livedvd/stages/README
650 rename to releases/overlays/common/overlay/livedvd/stages/README
651
652 diff --git a/releases/weekly/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml b/releases/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml
653 similarity index 100%
654 rename from releases/weekly/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml
655 rename to releases/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml
656
657 diff --git a/releases/weekly/overlays/common/root_overlay/home/gentoo/.xscreensaver b/releases/overlays/common/root_overlay/home/gentoo/.xscreensaver
658 similarity index 100%
659 rename from releases/weekly/overlays/common/root_overlay/home/gentoo/.xscreensaver
660 rename to releases/overlays/common/root_overlay/home/gentoo/.xscreensaver
661
662 diff --git a/releases/weekly/portage/isos/package.accept_keywords/admincd-packages b/releases/portage/isos/package.accept_keywords/admincd-packages
663 similarity index 100%
664 rename from releases/weekly/portage/isos/package.accept_keywords/admincd-packages
665 rename to releases/portage/isos/package.accept_keywords/admincd-packages
666
667 diff --git a/releases/weekly/portage/isos/package.accept_keywords/zfs b/releases/portage/isos/package.accept_keywords/zfs
668 similarity index 100%
669 rename from releases/weekly/portage/isos/package.accept_keywords/zfs
670 rename to releases/portage/isos/package.accept_keywords/zfs
671
672 diff --git a/releases/weekly/portage/isos/package.license/package.license b/releases/portage/isos/package.license/package.license
673 similarity index 100%
674 rename from releases/weekly/portage/isos/package.license/package.license
675 rename to releases/portage/isos/package.license/package.license
676
677 diff --git a/releases/weekly/portage/isos/package.use/admincd-packages b/releases/portage/isos/package.use/admincd-packages
678 similarity index 100%
679 rename from releases/weekly/portage/isos/package.use/admincd-packages
680 rename to releases/portage/isos/package.use/admincd-packages
681
682 diff --git a/releases/weekly/portage/isos/package.use/cifs-utils b/releases/portage/isos/package.use/cifs-utils
683 similarity index 100%
684 rename from releases/weekly/portage/isos/package.use/cifs-utils
685 rename to releases/portage/isos/package.use/cifs-utils
686
687 diff --git a/releases/weekly/portage/isos/package.use/genkernel b/releases/portage/isos/package.use/genkernel
688 similarity index 100%
689 rename from releases/weekly/portage/isos/package.use/genkernel
690 rename to releases/portage/isos/package.use/genkernel
691
692 diff --git a/releases/weekly/portage/isos/package.use/linux-firmware b/releases/portage/isos/package.use/linux-firmware
693 similarity index 100%
694 rename from releases/weekly/portage/isos/package.use/linux-firmware
695 rename to releases/portage/isos/package.use/linux-firmware
696
697 diff --git a/releases/weekly/portage/isos/savedconfig/sys-kernel/linux-firmware b/releases/portage/isos/savedconfig/sys-kernel/linux-firmware
698 similarity index 100%
699 rename from releases/weekly/portage/isos/savedconfig/sys-kernel/linux-firmware
700 rename to releases/portage/isos/savedconfig/sys-kernel/linux-firmware
701
702 diff --git a/releases/weekly/portage/stages/package.use/releng/libpcre b/releases/portage/stages/package.use/releng/libpcre
703 similarity index 100%
704 rename from releases/weekly/portage/stages/package.use/releng/libpcre
705 rename to releases/portage/stages/package.use/releng/libpcre
706
707 diff --git a/releases/weekly/portage/stages/package.use/releng/no-filecaps b/releases/portage/stages/package.use/releng/no-filecaps
708 similarity index 100%
709 rename from releases/weekly/portage/stages/package.use/releng/no-filecaps
710 rename to releases/portage/stages/package.use/releng/no-filecaps
711
712 diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/scripts/cloud-prep.sh
713 similarity index 100%
714 rename from releases/weekly/scripts/cloud-prep.sh
715 rename to releases/scripts/cloud-prep.sh
716
717 diff --git a/releases/weekly/scripts/livecd.sh b/releases/scripts/livecd.sh
718 similarity index 100%
719 rename from releases/weekly/scripts/livecd.sh
720 rename to releases/scripts/livecd.sh
721
722 diff --git a/releases/weekly/specs/alpha/installcd-stage1.spec b/releases/specs/alpha/installcd-stage1.spec
723 similarity index 95%
724 rename from releases/weekly/specs/alpha/installcd-stage1.spec
725 rename to releases/specs/alpha/installcd-stage1.spec
726 index 2e540247..726f717f 100644
727 --- a/releases/weekly/specs/alpha/installcd-stage1.spec
728 +++ b/releases/specs/alpha/installcd-stage1.spec
729 @@ -5,7 +5,7 @@ rel_type: default
730 profile: default/linux/alpha/17.0
731 snapshot: 2008.0
732 source_subpath: default/stage3-alpha-2008.0
733 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
734 +portage_confdir: @REPO_DIR@/releases/portage/isos
735 livecd/use:
736 compile-locales
737 fbcon
738
739 diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec b/releases/specs/alpha/installcd-stage2-minimal.spec
740 similarity index 98%
741 rename from releases/weekly/specs/alpha/installcd-stage2-minimal.spec
742 rename to releases/specs/alpha/installcd-stage2-minimal.spec
743 index 0a117287..e595eb2c 100644
744 --- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
745 +++ b/releases/specs/alpha/installcd-stage2-minimal.spec
746 @@ -5,11 +5,11 @@ rel_type: default
747 profile: default/linux/alpha/17.0
748 snapshot: 2008.0
749 source_subpath: default/livecd-stage1-alpha-2008.0
750 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
751 +portage_confdir: @REPO_DIR@/releases/portage/isos
752
753 livecd/bootargs: dokeymap
754 livecd/cdtar: /root/aboot-1.0_pre20040408-r2-cdtar-weekly.tar.bz2
755 -livecd/fsscript: /root/releng/releases/weekly/scripts/livecd.sh
756 +livecd/fsscript: /root/releng/releases/scripts/livecd.sh
757 livecd/fstype: squashfs
758 livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-minimal-2008.0.iso
759 livecd/type: gentoo-release-minimal
760
761 diff --git a/releases/weekly/specs/alpha/netboot/bs.conf b/releases/specs/alpha/netboot/bs.conf
762 similarity index 100%
763 rename from releases/weekly/specs/alpha/netboot/bs.conf
764 rename to releases/specs/alpha/netboot/bs.conf
765
766 diff --git a/releases/weekly/specs/alpha/netboot/cmd b/releases/specs/alpha/netboot/cmd
767 similarity index 100%
768 rename from releases/weekly/specs/alpha/netboot/cmd
769 rename to releases/specs/alpha/netboot/cmd
770
771 diff --git a/releases/weekly/specs/alpha/netboot/config b/releases/specs/alpha/netboot/config
772 similarity index 100%
773 rename from releases/weekly/specs/alpha/netboot/config
774 rename to releases/specs/alpha/netboot/config
775
776 diff --git a/releases/weekly/specs/alpha/netboot/netboot2.spec b/releases/specs/alpha/netboot/netboot2.spec
777 similarity index 100%
778 rename from releases/weekly/specs/alpha/netboot/netboot2.spec
779 rename to releases/specs/alpha/netboot/netboot2.spec
780
781 diff --git a/releases/weekly/specs/alpha/stage1.spec b/releases/specs/alpha/stage1.spec
782 similarity index 75%
783 rename from releases/weekly/specs/alpha/stage1.spec
784 rename to releases/specs/alpha/stage1.spec
785 index 7e768f50..89686b27 100644
786 --- a/releases/weekly/specs/alpha/stage1.spec
787 +++ b/releases/specs/alpha/stage1.spec
788 @@ -6,4 +6,4 @@ profile: default/linux/alpha/17.0
789 snapshot: 2008.0
790 source_subpath: default/stage3-alpha-latest
791 update_seed: yes
792 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
793 +portage_confdir: @REPO_DIR@/releases/portage/stages
794
795 diff --git a/releases/weekly/specs/alpha/stage2.spec b/releases/specs/alpha/stage2.spec
796 similarity index 73%
797 rename from releases/weekly/specs/alpha/stage2.spec
798 rename to releases/specs/alpha/stage2.spec
799 index 16677d2e..f0afaba2 100644
800 --- a/releases/weekly/specs/alpha/stage2.spec
801 +++ b/releases/specs/alpha/stage2.spec
802 @@ -5,4 +5,4 @@ rel_type: default
803 profile: default/linux/alpha/17.0
804 snapshot: 2008.0
805 source_subpath: default/stage1-alpha-2008.0
806 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
807 +portage_confdir: @REPO_DIR@/releases/portage/stages
808
809 diff --git a/releases/weekly/specs/alpha/stage3.spec b/releases/specs/alpha/stage3.spec
810 similarity index 73%
811 rename from releases/weekly/specs/alpha/stage3.spec
812 rename to releases/specs/alpha/stage3.spec
813 index dd26843f..679ffab7 100644
814 --- a/releases/weekly/specs/alpha/stage3.spec
815 +++ b/releases/specs/alpha/stage3.spec
816 @@ -5,4 +5,4 @@ rel_type: default
817 profile: default/linux/alpha/17.0
818 snapshot: 2008.0
819 source_subpath: default/stage1-alpha-2008.0
820 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
821 +portage_confdir: @REPO_DIR@/releases/portage/stages
822
823 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
824 similarity index 98%
825 rename from releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
826 rename to releases/specs/amd64/hardened/admincd-stage1-selinux.spec
827 index 5db7798b..706e35e3 100644
828 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
829 +++ b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
830 @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/hardened/selinux
831 snapshot: latest
832 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
833 compression_mode: pixz_x
834 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
835 +portage_confdir: @REPO_DIR@/releases/portage/isos
836
837 livecd/use:
838 alsa
839
840 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec
841 similarity index 98%
842 rename from releases/weekly/specs/amd64/hardened/admincd-stage1.spec
843 rename to releases/specs/amd64/hardened/admincd-stage1.spec
844 index b1aa74ee..5121cf54 100644
845 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
846 +++ b/releases/specs/amd64/hardened/admincd-stage1.spec
847 @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.1/hardened
848 snapshot: latest
849 source_subpath: hardened/stage3-amd64-hardened-latest
850 compression_mode: pixz_x
851 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
852 +portage_confdir: @REPO_DIR@/releases/portage/isos
853
854 livecd/use:
855 alsa
856
857 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
858 similarity index 96%
859 rename from releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
860 rename to releases/specs/amd64/hardened/admincd-stage2-selinux.spec
861 index 9d00482c..7306688b 100644
862 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
863 +++ b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
864 @@ -5,7 +5,7 @@ rel_type: hardened
865 profile: default/linux/amd64/17.0/hardened/selinux
866 snapshot: latest
867 source_subpath: hardened/livecd-stage1-amd64-latest-selinux
868 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
869 +portage_confdir: @REPO_DIR@/releases/portage/isos
870
871 livecd/bootargs: dokeymap
872 livecd/fstype: squashfs
873 @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD latest
874 boot/kernel: gentoo
875
876 boot/kernel/gentoo/sources: gentoo-sources
877 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config
878 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config
879
880 #boot/kernel/gentoo/packages:
881 # ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
882
883 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
884 similarity index 97%
885 rename from releases/weekly/specs/amd64/hardened/admincd-stage2.spec
886 rename to releases/specs/amd64/hardened/admincd-stage2.spec
887 index 6997f55a..90d836cc 100644
888 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
889 +++ b/releases/specs/amd64/hardened/admincd-stage2.spec
890 @@ -5,7 +5,7 @@ rel_type: hardened
891 profile: default/linux/amd64/17.1/hardened
892 snapshot: latest
893 source_subpath: hardened/livecd-stage1-amd64-latest
894 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
895 +portage_confdir: @REPO_DIR@/releases/portage/isos
896
897 livecd/bootargs: dokeymap
898 livecd/fstype: squashfs
899 @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD latest
900 boot/kernel: gentoo
901
902 boot/kernel/gentoo/sources: gentoo-sources
903 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.14.83.config
904 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.14.83.config
905
906 #boot/kernel/gentoo/packages:
907 # ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
908
909 diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/specs/amd64/hardened/stage1-nomultilib.spec
910 similarity index 86%
911 rename from releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
912 rename to releases/specs/amd64/hardened/stage1-nomultilib.spec
913 index 2a5e1d8b..8d659e0b 100644
914 --- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
915 +++ b/releases/specs/amd64/hardened/stage1-nomultilib.spec
916 @@ -9,5 +9,5 @@ compression_mode: pixz_x
917 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
918 update_seed: yes
919 update_seed_command: --update --deep @world
920 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
921 +portage_confdir: @REPO_DIR@/releases/portage/stages
922 portage_prefix: releng
923
924 diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
925 similarity index 87%
926 rename from releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
927 rename to releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
928 index c38147e5..88c22d92 100644
929 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
930 +++ b/releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
931 @@ -9,5 +9,5 @@ compression_mode: pixz_x
932 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
933 update_seed: yes
934 update_seed_command: --update --deep @world
935 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
936 +portage_confdir: @REPO_DIR@/releases/portage/stages
937 portage_prefix: releng
938
939 diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/specs/amd64/hardened/stage1-selinux.spec
940 similarity index 86%
941 rename from releases/weekly/specs/amd64/hardened/stage1-selinux.spec
942 rename to releases/specs/amd64/hardened/stage1-selinux.spec
943 index 28174034..4956f9d1 100644
944 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
945 +++ b/releases/specs/amd64/hardened/stage1-selinux.spec
946 @@ -9,5 +9,5 @@ compression_mode: pixz_x
947 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
948 update_seed: yes
949 update_seed_command: --update --deep @world
950 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
951 +portage_confdir: @REPO_DIR@/releases/portage/stages
952 portage_prefix: releng
953
954 diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/specs/amd64/hardened/stage1.spec
955 similarity index 85%
956 rename from releases/weekly/specs/amd64/hardened/stage1.spec
957 rename to releases/specs/amd64/hardened/stage1.spec
958 index 7bac6cfc..5fe18de4 100644
959 --- a/releases/weekly/specs/amd64/hardened/stage1.spec
960 +++ b/releases/specs/amd64/hardened/stage1.spec
961 @@ -9,5 +9,5 @@ compression_mode: pixz_x
962 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
963 update_seed: yes
964 update_seed_command: --update --deep @world
965 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
966 +portage_confdir: @REPO_DIR@/releases/portage/stages
967 portage_prefix: releng
968
969 diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/specs/amd64/hardened/stage2-nomultilib.spec
970 similarity index 84%
971 rename from releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
972 rename to releases/specs/amd64/hardened/stage2-nomultilib.spec
973 index db760bfb..32af0240 100644
974 --- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
975 +++ b/releases/specs/amd64/hardened/stage2-nomultilib.spec
976 @@ -7,5 +7,5 @@ snapshot: latest
977 source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest
978 compression_mode: pixz_x
979 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
980 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
981 +portage_confdir: @REPO_DIR@/releases/portage/stages
982 portage_prefix: releng
983
984 diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
985 similarity index 85%
986 rename from releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
987 rename to releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
988 index 7f3a2c08..c816ad6b 100644
989 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
990 +++ b/releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
991 @@ -7,5 +7,5 @@ snapshot: latest
992 source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest
993 compression_mode: pixz_x
994 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
995 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
996 +portage_confdir: @REPO_DIR@/releases/portage/stages
997 portage_prefix: releng
998
999 diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/specs/amd64/hardened/stage2-selinux.spec
1000 similarity index 84%
1001 rename from releases/weekly/specs/amd64/hardened/stage2-selinux.spec
1002 rename to releases/specs/amd64/hardened/stage2-selinux.spec
1003 index 331817e8..ab84ad81 100644
1004 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
1005 +++ b/releases/specs/amd64/hardened/stage2-selinux.spec
1006 @@ -7,5 +7,5 @@ snapshot: latest
1007 source_subpath: hardened/stage1-amd64-hardened-selinux-latest
1008 compression_mode: pixz_x
1009 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1010 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1011 +portage_confdir: @REPO_DIR@/releases/portage/stages
1012 portage_prefix: releng
1013
1014 diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/specs/amd64/hardened/stage2.spec
1015 similarity index 83%
1016 rename from releases/weekly/specs/amd64/hardened/stage2.spec
1017 rename to releases/specs/amd64/hardened/stage2.spec
1018 index 48230471..8bb40f3f 100644
1019 --- a/releases/weekly/specs/amd64/hardened/stage2.spec
1020 +++ b/releases/specs/amd64/hardened/stage2.spec
1021 @@ -7,5 +7,5 @@ snapshot: latest
1022 source_subpath: hardened/stage1-amd64-hardened-latest
1023 compression_mode: pixz_x
1024 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1025 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1026 +portage_confdir: @REPO_DIR@/releases/portage/stages
1027 portage_prefix: releng
1028
1029 diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/specs/amd64/hardened/stage3-nomultilib.spec
1030 similarity index 84%
1031 rename from releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
1032 rename to releases/specs/amd64/hardened/stage3-nomultilib.spec
1033 index 839223bf..2a518ac1 100644
1034 --- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
1035 +++ b/releases/specs/amd64/hardened/stage3-nomultilib.spec
1036 @@ -7,5 +7,5 @@ snapshot: latest
1037 source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest
1038 compression_mode: pixz_x
1039 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1040 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1041 +portage_confdir: @REPO_DIR@/releases/portage/stages
1042 portage_prefix: releng
1043
1044 diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
1045 similarity index 85%
1046 rename from releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
1047 rename to releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
1048 index f4ddbbde..7f0a42ea 100644
1049 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
1050 +++ b/releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
1051 @@ -7,5 +7,5 @@ snapshot: latest
1052 source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest
1053 compression_mode: pixz_x
1054 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1055 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1056 +portage_confdir: @REPO_DIR@/releases/portage/stages
1057 portage_prefix: releng
1058
1059 diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/specs/amd64/hardened/stage3-selinux.spec
1060 similarity index 84%
1061 rename from releases/weekly/specs/amd64/hardened/stage3-selinux.spec
1062 rename to releases/specs/amd64/hardened/stage3-selinux.spec
1063 index e0f1d9bb..2c273f3b 100644
1064 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
1065 +++ b/releases/specs/amd64/hardened/stage3-selinux.spec
1066 @@ -7,5 +7,5 @@ snapshot: latest
1067 source_subpath: hardened/stage2-amd64-hardened-selinux-latest
1068 compression_mode: pixz_x
1069 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1070 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1071 +portage_confdir: @REPO_DIR@/releases/portage/stages
1072 portage_prefix: releng
1073
1074 diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/specs/amd64/hardened/stage3.spec
1075 similarity index 83%
1076 rename from releases/weekly/specs/amd64/hardened/stage3.spec
1077 rename to releases/specs/amd64/hardened/stage3.spec
1078 index 4006ede9..ae6ed00a 100644
1079 --- a/releases/weekly/specs/amd64/hardened/stage3.spec
1080 +++ b/releases/specs/amd64/hardened/stage3.spec
1081 @@ -7,5 +7,5 @@ snapshot: latest
1082 source_subpath: hardened/stage2-amd64-hardened-latest
1083 compression_mode: pixz_x
1084 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1085 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1086 +portage_confdir: @REPO_DIR@/releases/portage/stages
1087 portage_prefix: releng
1088
1089 diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/specs/amd64/hardened/stage4-minimal.spec
1090 similarity index 85%
1091 rename from releases/weekly/specs/amd64/hardened/stage4-minimal.spec
1092 rename to releases/specs/amd64/hardened/stage4-minimal.spec
1093 index 7a0b32e3..e93c034d 100644
1094 --- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
1095 +++ b/releases/specs/amd64/hardened/stage4-minimal.spec
1096 @@ -7,7 +7,7 @@ snapshot: latest
1097 compression_mode: pixz_x
1098 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1099 source_subpath: hardened/stage3-amd64-hardened-latest
1100 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1101 +portage_confdir: @REPO_DIR@/releases/portage/isos
1102
1103 stage4/use:
1104 bindist
1105 @@ -25,7 +25,7 @@ stage4/packages:
1106 sys-devel/bc
1107 sys-power/acpid
1108 app-crypt/gentoo-keys
1109 -stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
1110 +stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
1111 stage4/rcadd:
1112 acpid|default
1113 net.lo|default
1114 @@ -34,7 +34,7 @@ stage4/rcadd:
1115
1116 boot/kernel: gentoo
1117 boot/kernel/gentoo/sources: gentoo-sources
1118 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
1119 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
1120 boot/kernel/gentoo/extraversion: openstack
1121 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
1122
1123
1124 diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
1125 similarity index 86%
1126 rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
1127 rename to releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
1128 index 52d230e3..e0cab1d3 100644
1129 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
1130 +++ b/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
1131 @@ -7,7 +7,7 @@ snapshot: latest
1132 compression_mode: pixz_x
1133 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1134 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
1135 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1136 +portage_confdir: @REPO_DIR@/releases/portage/isos
1137
1138 stage4/use:
1139 bindist
1140 @@ -25,7 +25,7 @@ stage4/packages:
1141 sys-devel/bc
1142 sys-power/acpid
1143 app-crypt/gentoo-keys
1144 -stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
1145 +stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
1146 stage4/rcadd:
1147 acpid|default
1148 net.lo|default
1149 @@ -34,7 +34,7 @@ stage4/rcadd:
1150
1151 boot/kernel: gentoo
1152 boot/kernel/gentoo/sources: gentoo-sources
1153 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
1154 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
1155 boot/kernel/gentoo/extraversion: openstack
1156 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
1157
1158
1159 diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/specs/amd64/installcd-stage1.spec
1160 similarity index 97%
1161 rename from releases/weekly/specs/amd64/installcd-stage1.spec
1162 rename to releases/specs/amd64/installcd-stage1.spec
1163 index 9ef6c941..a3885784 100644
1164 --- a/releases/weekly/specs/amd64/installcd-stage1.spec
1165 +++ b/releases/specs/amd64/installcd-stage1.spec
1166 @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.1/no-multilib
1167 snapshot: latest
1168 source_subpath: default/stage3-amd64-latest
1169 compression_mode: pixz_x
1170 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1171 +portage_confdir: @REPO_DIR@/releases/portage/isos
1172
1173 livecd/use:
1174 alsa
1175
1176 diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec
1177 similarity index 96%
1178 rename from releases/weekly/specs/amd64/installcd-stage2-minimal.spec
1179 rename to releases/specs/amd64/installcd-stage2-minimal.spec
1180 index 4ba33b34..3ae17ccb 100644
1181 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
1182 +++ b/releases/specs/amd64/installcd-stage2-minimal.spec
1183 @@ -5,7 +5,7 @@ rel_type: default
1184 profile: default/linux/amd64/17.1/no-multilib
1185 snapshot: latest
1186 source_subpath: default/livecd-stage1-amd64-latest
1187 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1188 +portage_confdir: @REPO_DIR@/releases/portage/isos
1189
1190 livecd/bootargs: dokeymap
1191 livecd/fstype: squashfs
1192 @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 latest
1193 boot/kernel: gentoo
1194
1195 boot/kernel/gentoo/sources: gentoo-sources
1196 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/installcd-4.14.52.config
1197 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/installcd-4.14.52.config
1198
1199 livecd/unmerge:
1200 app-admin/eselect
1201
1202 diff --git a/releases/weekly/specs/amd64/livecd-stage1.spec b/releases/specs/amd64/livecd-stage1.spec
1203 similarity index 100%
1204 rename from releases/weekly/specs/amd64/livecd-stage1.spec
1205 rename to releases/specs/amd64/livecd-stage1.spec
1206
1207 diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/specs/amd64/livecd-stage2.spec
1208 similarity index 100%
1209 rename from releases/weekly/specs/amd64/livecd-stage2.spec
1210 rename to releases/specs/amd64/livecd-stage2.spec
1211
1212 diff --git a/releases/weekly/specs/amd64/livedvd-stage1.spec b/releases/specs/amd64/livedvd-stage1.spec
1213 similarity index 100%
1214 rename from releases/weekly/specs/amd64/livedvd-stage1.spec
1215 rename to releases/specs/amd64/livedvd-stage1.spec
1216
1217 diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/specs/amd64/livedvd-stage2.spec
1218 similarity index 100%
1219 rename from releases/weekly/specs/amd64/livedvd-stage2.spec
1220 rename to releases/specs/amd64/livedvd-stage2.spec
1221
1222 diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/specs/amd64/stage1-nomultilib.spec
1223 similarity index 86%
1224 rename from releases/weekly/specs/amd64/stage1-nomultilib.spec
1225 rename to releases/specs/amd64/stage1-nomultilib.spec
1226 index 43502eae..fc457286 100644
1227 --- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
1228 +++ b/releases/specs/amd64/stage1-nomultilib.spec
1229 @@ -9,5 +9,5 @@ compression_mode: pixz_x
1230 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1231 update_seed: yes
1232 update_seed_command: --update --deep @world
1233 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1234 +portage_confdir: @REPO_DIR@/releases/portage/stages
1235 portage_prefix: releng
1236
1237 diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/specs/amd64/stage1-x32.spec
1238 similarity index 84%
1239 rename from releases/weekly/specs/amd64/stage1-x32.spec
1240 rename to releases/specs/amd64/stage1-x32.spec
1241 index e8ee6f72..e55bf9ed 100644
1242 --- a/releases/weekly/specs/amd64/stage1-x32.spec
1243 +++ b/releases/specs/amd64/stage1-x32.spec
1244 @@ -9,5 +9,5 @@ compression_mode: pixz_x
1245 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1246 update_seed: yes
1247 update_seed_command: --update --deep @world
1248 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1249 +portage_confdir: @REPO_DIR@/releases/portage/stages
1250 portage_prefix: releng
1251
1252 diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/specs/amd64/stage1.spec
1253 similarity index 84%
1254 rename from releases/weekly/specs/amd64/stage1.spec
1255 rename to releases/specs/amd64/stage1.spec
1256 index 8cd84fa8..a1781ac0 100644
1257 --- a/releases/weekly/specs/amd64/stage1.spec
1258 +++ b/releases/specs/amd64/stage1.spec
1259 @@ -9,5 +9,5 @@ compression_mode: pixz_x
1260 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1261 update_seed: yes
1262 update_seed_command: --update --deep @world
1263 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1264 +portage_confdir: @REPO_DIR@/releases/portage/stages
1265 portage_prefix: releng
1266
1267 diff --git a/releases/weekly/specs/amd64/stage2-desktop.spec b/releases/specs/amd64/stage2-desktop.spec
1268 similarity index 100%
1269 rename from releases/weekly/specs/amd64/stage2-desktop.spec
1270 rename to releases/specs/amd64/stage2-desktop.spec
1271
1272 diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/specs/amd64/stage2-nomultilib.spec
1273 similarity index 83%
1274 rename from releases/weekly/specs/amd64/stage2-nomultilib.spec
1275 rename to releases/specs/amd64/stage2-nomultilib.spec
1276 index a9ba2b65..bb33a7a3 100644
1277 --- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
1278 +++ b/releases/specs/amd64/stage2-nomultilib.spec
1279 @@ -7,5 +7,5 @@ snapshot: latest
1280 source_subpath: default/stage1-amd64-nomultilib-latest
1281 compression_mode: pixz_x
1282 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1283 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1284 +portage_confdir: @REPO_DIR@/releases/portage/stages
1285 portage_prefix: releng
1286
1287 diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/specs/amd64/stage2-x32.spec
1288 similarity index 82%
1289 rename from releases/weekly/specs/amd64/stage2-x32.spec
1290 rename to releases/specs/amd64/stage2-x32.spec
1291 index e9b6138f..ad81688a 100644
1292 --- a/releases/weekly/specs/amd64/stage2-x32.spec
1293 +++ b/releases/specs/amd64/stage2-x32.spec
1294 @@ -7,5 +7,5 @@ snapshot: latest
1295 source_subpath: default/stage1-x32-latest
1296 compression_mode: pixz_x
1297 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1298 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1299 +portage_confdir: @REPO_DIR@/releases/portage/stages
1300 portage_prefix: releng
1301
1302 diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/specs/amd64/stage2.spec
1303 similarity index 82%
1304 rename from releases/weekly/specs/amd64/stage2.spec
1305 rename to releases/specs/amd64/stage2.spec
1306 index d199b5dd..321e028e 100644
1307 --- a/releases/weekly/specs/amd64/stage2.spec
1308 +++ b/releases/specs/amd64/stage2.spec
1309 @@ -7,5 +7,5 @@ snapshot: latest
1310 source_subpath: default/stage1-amd64-latest
1311 compression_mode: pixz_x
1312 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1313 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1314 +portage_confdir: @REPO_DIR@/releases/portage/stages
1315 portage_prefix: releng
1316
1317 diff --git a/releases/weekly/specs/amd64/stage3-desktop.spec b/releases/specs/amd64/stage3-desktop.spec
1318 similarity index 100%
1319 rename from releases/weekly/specs/amd64/stage3-desktop.spec
1320 rename to releases/specs/amd64/stage3-desktop.spec
1321
1322 diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/specs/amd64/stage3-nomultilib.spec
1323 similarity index 83%
1324 rename from releases/weekly/specs/amd64/stage3-nomultilib.spec
1325 rename to releases/specs/amd64/stage3-nomultilib.spec
1326 index 6469aba8..a358759a 100644
1327 --- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
1328 +++ b/releases/specs/amd64/stage3-nomultilib.spec
1329 @@ -7,5 +7,5 @@ snapshot: latest
1330 source_subpath: default/stage2-amd64-nomultilib-latest
1331 compression_mode: pixz_x
1332 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1333 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1334 +portage_confdir: @REPO_DIR@/releases/portage/stages
1335 portage_prefix: releng
1336
1337 diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/specs/amd64/stage3-x32.spec
1338 similarity index 82%
1339 rename from releases/weekly/specs/amd64/stage3-x32.spec
1340 rename to releases/specs/amd64/stage3-x32.spec
1341 index 5c9417e3..b38f0b37 100644
1342 --- a/releases/weekly/specs/amd64/stage3-x32.spec
1343 +++ b/releases/specs/amd64/stage3-x32.spec
1344 @@ -7,5 +7,5 @@ snapshot: latest
1345 source_subpath: default/stage2-x32-latest
1346 compression_mode: pixz_x
1347 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1348 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1349 +portage_confdir: @REPO_DIR@/releases/portage/stages
1350 portage_prefix: releng
1351
1352 diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/specs/amd64/stage3.spec
1353 similarity index 82%
1354 rename from releases/weekly/specs/amd64/stage3.spec
1355 rename to releases/specs/amd64/stage3.spec
1356 index 6caacc13..04798a64 100644
1357 --- a/releases/weekly/specs/amd64/stage3.spec
1358 +++ b/releases/specs/amd64/stage3.spec
1359 @@ -7,5 +7,5 @@ snapshot: latest
1360 source_subpath: default/stage2-amd64-latest
1361 compression_mode: pixz_x
1362 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1363 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1364 +portage_confdir: @REPO_DIR@/releases/portage/stages
1365 portage_prefix: releng
1366
1367 diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/specs/amd64/stage4-minimal.spec
1368 similarity index 85%
1369 rename from releases/weekly/specs/amd64/stage4-minimal.spec
1370 rename to releases/specs/amd64/stage4-minimal.spec
1371 index 40e4b5b5..8037baa5 100644
1372 --- a/releases/weekly/specs/amd64/stage4-minimal.spec
1373 +++ b/releases/specs/amd64/stage4-minimal.spec
1374 @@ -7,7 +7,7 @@ snapshot: latest
1375 compression_mode: pixz_x
1376 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1377 source_subpath: default/stage3-amd64-latest
1378 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1379 +portage_confdir: @REPO_DIR@/releases/portage/isos
1380
1381 stage4/use:
1382 bindist
1383 @@ -25,7 +25,7 @@ stage4/packages:
1384 sys-devel/bc
1385 sys-power/acpid
1386 app-crypt/gentoo-keys
1387 -stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
1388 +stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
1389 stage4/rcadd:
1390 acpid|default
1391 net.lo|default
1392 @@ -34,7 +34,7 @@ stage4/rcadd:
1393
1394 boot/kernel: gentoo
1395 boot/kernel/gentoo/sources: gentoo-sources
1396 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
1397 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
1398 boot/kernel/gentoo/extraversion: openstack
1399 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
1400
1401
1402 diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/specs/amd64/stage4-nomultilib-minimal.spec
1403 similarity index 85%
1404 rename from releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
1405 rename to releases/specs/amd64/stage4-nomultilib-minimal.spec
1406 index 26020050..9bc36df5 100644
1407 --- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
1408 +++ b/releases/specs/amd64/stage4-nomultilib-minimal.spec
1409 @@ -7,7 +7,7 @@ snapshot: latest
1410 compression_mode: pixz_x
1411 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1412 source_subpath: default/stage3-amd64-nomultilib-latest
1413 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1414 +portage_confdir: @REPO_DIR@/releases/portage/isos
1415
1416 stage4/use:
1417 bindist
1418 @@ -25,7 +25,7 @@ stage4/packages:
1419 sys-devel/bc
1420 sys-power/acpid
1421 app-crypt/gentoo-keys
1422 -stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
1423 +stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
1424 stage4/rcadd:
1425 acpid|default
1426 net.lo|default
1427 @@ -34,7 +34,7 @@ stage4/rcadd:
1428
1429 boot/kernel: gentoo
1430 boot/kernel/gentoo/sources: gentoo-sources
1431 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
1432 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
1433 boot/kernel/gentoo/extraversion: openstack
1434 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
1435
1436
1437 diff --git a/releases/weekly/specs/arm/armeb/stage1.spec b/releases/specs/arm/armeb/stage1.spec
1438 similarity index 100%
1439 rename from releases/weekly/specs/arm/armeb/stage1.spec
1440 rename to releases/specs/arm/armeb/stage1.spec
1441
1442 diff --git a/releases/weekly/specs/arm/armeb/stage2.spec b/releases/specs/arm/armeb/stage2.spec
1443 similarity index 100%
1444 rename from releases/weekly/specs/arm/armeb/stage2.spec
1445 rename to releases/specs/arm/armeb/stage2.spec
1446
1447 diff --git a/releases/weekly/specs/arm/armeb/stage3.spec b/releases/specs/arm/armeb/stage3.spec
1448 similarity index 100%
1449 rename from releases/weekly/specs/arm/armeb/stage3.spec
1450 rename to releases/specs/arm/armeb/stage3.spec
1451
1452 diff --git a/releases/weekly/specs/arm/armv4l/stage1.spec b/releases/specs/arm/armv4l/stage1.spec
1453 similarity index 100%
1454 rename from releases/weekly/specs/arm/armv4l/stage1.spec
1455 rename to releases/specs/arm/armv4l/stage1.spec
1456
1457 diff --git a/releases/weekly/specs/arm/armv4l/stage2.spec b/releases/specs/arm/armv4l/stage2.spec
1458 similarity index 100%
1459 rename from releases/weekly/specs/arm/armv4l/stage2.spec
1460 rename to releases/specs/arm/armv4l/stage2.spec
1461
1462 diff --git a/releases/weekly/specs/arm/armv4l/stage3.spec b/releases/specs/arm/armv4l/stage3.spec
1463 similarity index 100%
1464 rename from releases/weekly/specs/arm/armv4l/stage3.spec
1465 rename to releases/specs/arm/armv4l/stage3.spec
1466
1467 diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage1.spec b/releases/specs/arm/armv4l/strongarm/stage1.spec
1468 similarity index 100%
1469 rename from releases/weekly/specs/arm/armv4l/strongarm/stage1.spec
1470 rename to releases/specs/arm/armv4l/strongarm/stage1.spec
1471
1472 diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage2.spec b/releases/specs/arm/armv4l/strongarm/stage2.spec
1473 similarity index 100%
1474 rename from releases/weekly/specs/arm/armv4l/strongarm/stage2.spec
1475 rename to releases/specs/arm/armv4l/strongarm/stage2.spec
1476
1477 diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage3.spec b/releases/specs/arm/armv4l/strongarm/stage3.spec
1478 similarity index 100%
1479 rename from releases/weekly/specs/arm/armv4l/strongarm/stage3.spec
1480 rename to releases/specs/arm/armv4l/strongarm/stage3.spec
1481
1482 diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage1.spec b/releases/specs/arm/armv4l/strongarm110/stage1.spec
1483 similarity index 100%
1484 rename from releases/weekly/specs/arm/armv4l/strongarm110/stage1.spec
1485 rename to releases/specs/arm/armv4l/strongarm110/stage1.spec
1486
1487 diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage2.spec b/releases/specs/arm/armv4l/strongarm110/stage2.spec
1488 similarity index 100%
1489 rename from releases/weekly/specs/arm/armv4l/strongarm110/stage2.spec
1490 rename to releases/specs/arm/armv4l/strongarm110/stage2.spec
1491
1492 diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage3.spec b/releases/specs/arm/armv4l/strongarm110/stage3.spec
1493 similarity index 100%
1494 rename from releases/weekly/specs/arm/armv4l/strongarm110/stage3.spec
1495 rename to releases/specs/arm/armv4l/strongarm110/stage3.spec
1496
1497 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage1.spec b/releases/specs/arm/armv4l/strongarm1100/stage1.spec
1498 similarity index 100%
1499 rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage1.spec
1500 rename to releases/specs/arm/armv4l/strongarm1100/stage1.spec
1501
1502 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage2.spec b/releases/specs/arm/armv4l/strongarm1100/stage2.spec
1503 similarity index 100%
1504 rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage2.spec
1505 rename to releases/specs/arm/armv4l/strongarm1100/stage2.spec
1506
1507 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage3.spec b/releases/specs/arm/armv4l/strongarm1100/stage3.spec
1508 similarity index 100%
1509 rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage3.spec
1510 rename to releases/specs/arm/armv4l/strongarm1100/stage3.spec
1511
1512 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage1.spec b/releases/specs/arm/armv4l/strongarm1110/stage1.spec
1513 similarity index 100%
1514 rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage1.spec
1515 rename to releases/specs/arm/armv4l/strongarm1110/stage1.spec
1516
1517 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage2.spec b/releases/specs/arm/armv4l/strongarm1110/stage2.spec
1518 similarity index 100%
1519 rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage2.spec
1520 rename to releases/specs/arm/armv4l/strongarm1110/stage2.spec
1521
1522 diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage3.spec b/releases/specs/arm/armv4l/strongarm1110/stage3.spec
1523 similarity index 100%
1524 rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage3.spec
1525 rename to releases/specs/arm/armv4l/strongarm1110/stage3.spec
1526
1527 diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage1.spec b/releases/specs/arm/armv4tl/openmoko/stage1.spec
1528 similarity index 100%
1529 rename from releases/weekly/specs/arm/armv4tl/openmoko/stage1.spec
1530 rename to releases/specs/arm/armv4tl/openmoko/stage1.spec
1531
1532 diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage2.spec b/releases/specs/arm/armv4tl/openmoko/stage2.spec
1533 similarity index 100%
1534 rename from releases/weekly/specs/arm/armv4tl/openmoko/stage2.spec
1535 rename to releases/specs/arm/armv4tl/openmoko/stage2.spec
1536
1537 diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage3.spec b/releases/specs/arm/armv4tl/openmoko/stage3.spec
1538 similarity index 100%
1539 rename from releases/weekly/specs/arm/armv4tl/openmoko/stage3.spec
1540 rename to releases/specs/arm/armv4tl/openmoko/stage3.spec
1541
1542 diff --git a/releases/weekly/specs/arm/armv4tl/stage1.spec b/releases/specs/arm/armv4tl/stage1.spec
1543 similarity index 100%
1544 rename from releases/weekly/specs/arm/armv4tl/stage1.spec
1545 rename to releases/specs/arm/armv4tl/stage1.spec
1546
1547 diff --git a/releases/weekly/specs/arm/armv4tl/stage2.spec b/releases/specs/arm/armv4tl/stage2.spec
1548 similarity index 100%
1549 rename from releases/weekly/specs/arm/armv4tl/stage2.spec
1550 rename to releases/specs/arm/armv4tl/stage2.spec
1551
1552 diff --git a/releases/weekly/specs/arm/armv4tl/stage3.spec b/releases/specs/arm/armv4tl/stage3.spec
1553 similarity index 100%
1554 rename from releases/weekly/specs/arm/armv4tl/stage3.spec
1555 rename to releases/specs/arm/armv4tl/stage3.spec
1556
1557 diff --git a/releases/weekly/specs/arm/armv5teb/stage1.spec b/releases/specs/arm/armv5teb/stage1.spec
1558 similarity index 100%
1559 rename from releases/weekly/specs/arm/armv5teb/stage1.spec
1560 rename to releases/specs/arm/armv5teb/stage1.spec
1561
1562 diff --git a/releases/weekly/specs/arm/armv5teb/stage2.spec b/releases/specs/arm/armv5teb/stage2.spec
1563 similarity index 100%
1564 rename from releases/weekly/specs/arm/armv5teb/stage2.spec
1565 rename to releases/specs/arm/armv5teb/stage2.spec
1566
1567 diff --git a/releases/weekly/specs/arm/armv5teb/stage3.spec b/releases/specs/arm/armv5teb/stage3.spec
1568 similarity index 100%
1569 rename from releases/weekly/specs/arm/armv5teb/stage3.spec
1570 rename to releases/specs/arm/armv5teb/stage3.spec
1571
1572 diff --git a/releases/weekly/specs/arm/armv5tejl/stage1.spec b/releases/specs/arm/armv5tejl/stage1.spec
1573 similarity index 100%
1574 rename from releases/weekly/specs/arm/armv5tejl/stage1.spec
1575 rename to releases/specs/arm/armv5tejl/stage1.spec
1576
1577 diff --git a/releases/weekly/specs/arm/armv5tejl/stage2.spec b/releases/specs/arm/armv5tejl/stage2.spec
1578 similarity index 100%
1579 rename from releases/weekly/specs/arm/armv5tejl/stage2.spec
1580 rename to releases/specs/arm/armv5tejl/stage2.spec
1581
1582 diff --git a/releases/weekly/specs/arm/armv5tejl/stage3.spec b/releases/specs/arm/armv5tejl/stage3.spec
1583 similarity index 100%
1584 rename from releases/weekly/specs/arm/armv5tejl/stage3.spec
1585 rename to releases/specs/arm/armv5tejl/stage3.spec
1586
1587 diff --git a/releases/weekly/specs/arm/armv5tel/stage1.spec b/releases/specs/arm/armv5tel/stage1.spec
1588 similarity index 100%
1589 rename from releases/weekly/specs/arm/armv5tel/stage1.spec
1590 rename to releases/specs/arm/armv5tel/stage1.spec
1591
1592 diff --git a/releases/weekly/specs/arm/armv5tel/stage2.spec b/releases/specs/arm/armv5tel/stage2.spec
1593 similarity index 100%
1594 rename from releases/weekly/specs/arm/armv5tel/stage2.spec
1595 rename to releases/specs/arm/armv5tel/stage2.spec
1596
1597 diff --git a/releases/weekly/specs/arm/armv5tel/stage3.spec b/releases/specs/arm/armv5tel/stage3.spec
1598 similarity index 100%
1599 rename from releases/weekly/specs/arm/armv5tel/stage3.spec
1600 rename to releases/specs/arm/armv5tel/stage3.spec
1601
1602 diff --git a/releases/weekly/specs/arm/armv5tl/stage1.spec b/releases/specs/arm/armv5tl/stage1.spec
1603 similarity index 100%
1604 rename from releases/weekly/specs/arm/armv5tl/stage1.spec
1605 rename to releases/specs/arm/armv5tl/stage1.spec
1606
1607 diff --git a/releases/weekly/specs/arm/armv5tl/stage2.spec b/releases/specs/arm/armv5tl/stage2.spec
1608 similarity index 100%
1609 rename from releases/weekly/specs/arm/armv5tl/stage2.spec
1610 rename to releases/specs/arm/armv5tl/stage2.spec
1611
1612 diff --git a/releases/weekly/specs/arm/armv5tl/stage3.spec b/releases/specs/arm/armv5tl/stage3.spec
1613 similarity index 100%
1614 rename from releases/weekly/specs/arm/armv5tl/stage3.spec
1615 rename to releases/specs/arm/armv5tl/stage3.spec
1616
1617 diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec b/releases/specs/arm/armv6j/hardfloat/stage1.spec
1618 similarity index 100%
1619 rename from releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec
1620 rename to releases/specs/arm/armv6j/hardfloat/stage1.spec
1621
1622 diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage2.spec b/releases/specs/arm/armv6j/hardfloat/stage2.spec
1623 similarity index 100%
1624 rename from releases/weekly/specs/arm/armv6j/hardfloat/stage2.spec
1625 rename to releases/specs/arm/armv6j/hardfloat/stage2.spec
1626
1627 diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage3.spec b/releases/specs/arm/armv6j/hardfloat/stage3.spec
1628 similarity index 100%
1629 rename from releases/weekly/specs/arm/armv6j/hardfloat/stage3.spec
1630 rename to releases/specs/arm/armv6j/hardfloat/stage3.spec
1631
1632 diff --git a/releases/weekly/specs/arm/armv6j/stage1.spec b/releases/specs/arm/armv6j/stage1.spec
1633 similarity index 100%
1634 rename from releases/weekly/specs/arm/armv6j/stage1.spec
1635 rename to releases/specs/arm/armv6j/stage1.spec
1636
1637 diff --git a/releases/weekly/specs/arm/armv6j/stage2.spec b/releases/specs/arm/armv6j/stage2.spec
1638 similarity index 100%
1639 rename from releases/weekly/specs/arm/armv6j/stage2.spec
1640 rename to releases/specs/arm/armv6j/stage2.spec
1641
1642 diff --git a/releases/weekly/specs/arm/armv6j/stage3.spec b/releases/specs/arm/armv6j/stage3.spec
1643 similarity index 100%
1644 rename from releases/weekly/specs/arm/armv6j/stage3.spec
1645 rename to releases/specs/arm/armv6j/stage3.spec
1646
1647 diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec b/releases/specs/arm/armv7a/hardfloat/stage1.spec
1648 similarity index 100%
1649 rename from releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec
1650 rename to releases/specs/arm/armv7a/hardfloat/stage1.spec
1651
1652 diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage2.spec b/releases/specs/arm/armv7a/hardfloat/stage2.spec
1653 similarity index 100%
1654 rename from releases/weekly/specs/arm/armv7a/hardfloat/stage2.spec
1655 rename to releases/specs/arm/armv7a/hardfloat/stage2.spec
1656
1657 diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage3.spec b/releases/specs/arm/armv7a/hardfloat/stage3.spec
1658 similarity index 100%
1659 rename from releases/weekly/specs/arm/armv7a/hardfloat/stage3.spec
1660 rename to releases/specs/arm/armv7a/hardfloat/stage3.spec
1661
1662 diff --git a/releases/weekly/specs/arm/armv7a/stage1.spec b/releases/specs/arm/armv7a/stage1.spec
1663 similarity index 100%
1664 rename from releases/weekly/specs/arm/armv7a/stage1.spec
1665 rename to releases/specs/arm/armv7a/stage1.spec
1666
1667 diff --git a/releases/weekly/specs/arm/armv7a/stage2.spec b/releases/specs/arm/armv7a/stage2.spec
1668 similarity index 100%
1669 rename from releases/weekly/specs/arm/armv7a/stage2.spec
1670 rename to releases/specs/arm/armv7a/stage2.spec
1671
1672 diff --git a/releases/weekly/specs/arm/armv7a/stage3.spec b/releases/specs/arm/armv7a/stage3.spec
1673 similarity index 100%
1674 rename from releases/weekly/specs/arm/armv7a/stage3.spec
1675 rename to releases/specs/arm/armv7a/stage3.spec
1676
1677 diff --git a/releases/weekly/specs/arm/stage1.spec b/releases/specs/arm/stage1.spec
1678 similarity index 100%
1679 rename from releases/weekly/specs/arm/stage1.spec
1680 rename to releases/specs/arm/stage1.spec
1681
1682 diff --git a/releases/weekly/specs/arm/stage2.spec b/releases/specs/arm/stage2.spec
1683 similarity index 100%
1684 rename from releases/weekly/specs/arm/stage2.spec
1685 rename to releases/specs/arm/stage2.spec
1686
1687 diff --git a/releases/weekly/specs/arm/stage3.spec b/releases/specs/arm/stage3.spec
1688 similarity index 100%
1689 rename from releases/weekly/specs/arm/stage3.spec
1690 rename to releases/specs/arm/stage3.spec
1691
1692 diff --git a/releases/weekly/specs/arm64/stage1.spec b/releases/specs/arm64/stage1.spec
1693 similarity index 84%
1694 rename from releases/weekly/specs/arm64/stage1.spec
1695 rename to releases/specs/arm64/stage1.spec
1696 index 62d473ac..2f90e9f4 100644
1697 --- a/releases/weekly/specs/arm64/stage1.spec
1698 +++ b/releases/specs/arm64/stage1.spec
1699 @@ -8,5 +8,5 @@ source_subpath: default/stage3-arm64-latest
1700 pkgcache_path: /var/tmp/catalyst/packages/stage1
1701 update_seed: yes
1702 update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
1703 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1704 +portage_confdir: @REPO_DIR@/releases/portage/stages
1705 portage_prefix: releng
1706
1707 diff --git a/releases/weekly/specs/arm64/stage2.spec b/releases/specs/arm64/stage2.spec
1708 similarity index 80%
1709 rename from releases/weekly/specs/arm64/stage2.spec
1710 rename to releases/specs/arm64/stage2.spec
1711 index 9f0c2234..bd2a53af 100644
1712 --- a/releases/weekly/specs/arm64/stage2.spec
1713 +++ b/releases/specs/arm64/stage2.spec
1714 @@ -6,5 +6,5 @@ profile: default/linux/arm64/17.0
1715 snapshot: current
1716 source_subpath: default/stage1-arm64-2008.0
1717 pkgcache_path: /var/tmp/catalyst/packages/stage2
1718 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1719 +portage_confdir: @REPO_DIR@/releases/portage/stages
1720 portage_prefix: releng
1721
1722 diff --git a/releases/weekly/specs/arm64/stage3.spec b/releases/specs/arm64/stage3.spec
1723 similarity index 80%
1724 rename from releases/weekly/specs/arm64/stage3.spec
1725 rename to releases/specs/arm64/stage3.spec
1726 index 2758e99f..4844564a 100644
1727 --- a/releases/weekly/specs/arm64/stage3.spec
1728 +++ b/releases/specs/arm64/stage3.spec
1729 @@ -6,5 +6,5 @@ profile: default/linux/arm64/17.0
1730 snapshot: current
1731 source_subpath: default/stage2-arm64-2008.0
1732 pkgcache_path: /var/tmp/catalyst/packages/stage3
1733 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1734 +portage_confdir: @REPO_DIR@/releases/portage/stages
1735 portage_prefix: releng
1736
1737 diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec b/releases/specs/arm64/stage4-minimal.spec
1738 similarity index 85%
1739 rename from releases/weekly/specs/arm64/stage4-minimal.spec
1740 rename to releases/specs/arm64/stage4-minimal.spec
1741 index af70604d..6bacc13c 100644
1742 --- a/releases/weekly/specs/arm64/stage4-minimal.spec
1743 +++ b/releases/specs/arm64/stage4-minimal.spec
1744 @@ -7,7 +7,7 @@ snapshot: current
1745 compression_mode: pixz_x
1746 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1747 source_subpath: default/stage3-arm64-2008.0
1748 -#portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1749 +#portage_confdir: @REPO_DIR@/releases/portage/isos
1750
1751 stage4/use:
1752 bindist
1753 @@ -24,7 +24,7 @@ stage4/packages:
1754 sys-devel/bc
1755 sys-power/acpid
1756 app-crypt/gentoo-keys
1757 -#stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
1758 +#stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
1759 stage4/rcadd:
1760 acpid|default
1761 net.lo|default
1762 @@ -33,7 +33,7 @@ stage4/rcadd:
1763
1764 boot/kernel: gentoo
1765 boot/kernel/gentoo/sources: gentoo-sources
1766 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/arm64/packet-arm64.config
1767 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/arm64/packet-arm64.config
1768 boot/kernel/gentoo/extraversion: openstack
1769 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
1770
1771
1772 diff --git a/releases/weekly/specs/hppa/hppa1.1/stage1.spec b/releases/specs/hppa/hppa1.1/stage1.spec
1773 similarity index 80%
1774 rename from releases/weekly/specs/hppa/hppa1.1/stage1.spec
1775 rename to releases/specs/hppa/hppa1.1/stage1.spec
1776 index d3f781ec..a15bf0ef 100644
1777 --- a/releases/weekly/specs/hppa/hppa1.1/stage1.spec
1778 +++ b/releases/specs/hppa/hppa1.1/stage1.spec
1779 @@ -6,5 +6,5 @@ profile: default/linux/hppa/17.0
1780 snapshot: 2008.0
1781 source_subpath: default/stage3-hppa1.1-latest
1782 update_seed: yes
1783 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1784 +portage_confdir: @REPO_DIR@/releases/portage/stages
1785 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1
1786
1787 diff --git a/releases/weekly/specs/hppa/hppa1.1/stage2.spec b/releases/specs/hppa/hppa1.1/stage2.spec
1788 similarity index 79%
1789 rename from releases/weekly/specs/hppa/hppa1.1/stage2.spec
1790 rename to releases/specs/hppa/hppa1.1/stage2.spec
1791 index acfd14e2..0ff24607 100644
1792 --- a/releases/weekly/specs/hppa/hppa1.1/stage2.spec
1793 +++ b/releases/specs/hppa/hppa1.1/stage2.spec
1794 @@ -5,5 +5,5 @@ rel_type: default
1795 profile: default/linux/hppa/17.0
1796 snapshot: 2008.0
1797 source_subpath: default/stage1-hppa1.1-2008.0
1798 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1799 +portage_confdir: @REPO_DIR@/releases/portage/stages
1800 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa1.1
1801
1802 diff --git a/releases/weekly/specs/hppa/hppa1.1/stage3.spec b/releases/specs/hppa/hppa1.1/stage3.spec
1803 similarity index 79%
1804 rename from releases/weekly/specs/hppa/hppa1.1/stage3.spec
1805 rename to releases/specs/hppa/hppa1.1/stage3.spec
1806 index 53d4725f..aa49a0df 100644
1807 --- a/releases/weekly/specs/hppa/hppa1.1/stage3.spec
1808 +++ b/releases/specs/hppa/hppa1.1/stage3.spec
1809 @@ -5,5 +5,5 @@ rel_type: default
1810 profile: default/linux/hppa/17.0
1811 snapshot: 2008.0
1812 source_subpath: default/stage1-hppa1.1-2008.0
1813 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1814 +portage_confdir: @REPO_DIR@/releases/portage/stages
1815 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1
1816
1817 diff --git a/releases/weekly/specs/hppa/hppa2.0/stage1.spec b/releases/specs/hppa/hppa2.0/stage1.spec
1818 similarity index 80%
1819 rename from releases/weekly/specs/hppa/hppa2.0/stage1.spec
1820 rename to releases/specs/hppa/hppa2.0/stage1.spec
1821 index 7a908f4a..01e8f0d5 100644
1822 --- a/releases/weekly/specs/hppa/hppa2.0/stage1.spec
1823 +++ b/releases/specs/hppa/hppa2.0/stage1.spec
1824 @@ -6,5 +6,5 @@ profile: default/linux/hppa/17.0
1825 snapshot: 2008.0
1826 source_subpath: default/stage3-hppa2.0-latest
1827 update_seed: yes
1828 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1829 +portage_confdir: @REPO_DIR@/releases/portage/stages
1830 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0
1831
1832 diff --git a/releases/weekly/specs/hppa/hppa2.0/stage2.spec b/releases/specs/hppa/hppa2.0/stage2.spec
1833 similarity index 79%
1834 rename from releases/weekly/specs/hppa/hppa2.0/stage2.spec
1835 rename to releases/specs/hppa/hppa2.0/stage2.spec
1836 index 812a8d7e..479dd27c 100644
1837 --- a/releases/weekly/specs/hppa/hppa2.0/stage2.spec
1838 +++ b/releases/specs/hppa/hppa2.0/stage2.spec
1839 @@ -5,5 +5,5 @@ rel_type: default
1840 profile: default/linux/hppa/17.0
1841 snapshot: 2008.0
1842 source_subpath: default/stage1-hppa2.0-2008.0
1843 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1844 +portage_confdir: @REPO_DIR@/releases/portage/stages
1845 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa2.0
1846
1847 diff --git a/releases/weekly/specs/hppa/hppa2.0/stage3.spec b/releases/specs/hppa/hppa2.0/stage3.spec
1848 similarity index 79%
1849 rename from releases/weekly/specs/hppa/hppa2.0/stage3.spec
1850 rename to releases/specs/hppa/hppa2.0/stage3.spec
1851 index 780fdb56..cbdce72b 100644
1852 --- a/releases/weekly/specs/hppa/hppa2.0/stage3.spec
1853 +++ b/releases/specs/hppa/hppa2.0/stage3.spec
1854 @@ -5,5 +5,5 @@ rel_type: default
1855 profile: default/linux/hppa/17.0
1856 snapshot: 2008.0
1857 source_subpath: default/stage1-hppa2.0-2008.0
1858 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1859 +portage_confdir: @REPO_DIR@/releases/portage/stages
1860 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0
1861
1862 diff --git a/releases/weekly/specs/hppa/installcd-stage1.spec b/releases/specs/hppa/installcd-stage1.spec
1863 similarity index 95%
1864 rename from releases/weekly/specs/hppa/installcd-stage1.spec
1865 rename to releases/specs/hppa/installcd-stage1.spec
1866 index 2938d3fa..2b609b90 100644
1867 --- a/releases/weekly/specs/hppa/installcd-stage1.spec
1868 +++ b/releases/specs/hppa/installcd-stage1.spec
1869 @@ -6,7 +6,7 @@ profile: default/linux/hppa/17.0
1870 snapshot: 20140201
1871 source_subpath: default/stage3-hppa1.1-20140201
1872 pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage1
1873 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1874 +portage_confdir: @REPO_DIR@/releases/portage/isos
1875 livecd/use:
1876 -*
1877 python_targets_python3_6
1878
1879 diff --git a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec
1880 similarity index 99%
1881 rename from releases/weekly/specs/hppa/installcd-stage2-minimal.spec
1882 rename to releases/specs/hppa/installcd-stage2-minimal.spec
1883 index aa6e7bb2..3abace12 100644
1884 --- a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
1885 +++ b/releases/specs/hppa/installcd-stage2-minimal.spec
1886 @@ -6,7 +6,7 @@ profile: default/linux/hppa/17.0
1887 snapshot: 20140201
1888 source_subpath: default/livecd-stage1-hppa1.1-20140201
1889 pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage2
1890 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1891 +portage_confdir: @REPO_DIR@/releases/portage/isos
1892
1893 livecd/volid: Gentoo hppa latest
1894 livecd/bootargs: dokeymap
1895
1896 diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/specs/hppa/installcd-stage2-universal.spec
1897 similarity index 100%
1898 rename from releases/weekly/specs/hppa/installcd-stage2-universal.spec
1899 rename to releases/specs/hppa/installcd-stage2-universal.spec
1900
1901 diff --git a/releases/weekly/specs/hppa/netboot2-hppa32.spec b/releases/specs/hppa/netboot2-hppa32.spec
1902 similarity index 97%
1903 rename from releases/weekly/specs/hppa/netboot2-hppa32.spec
1904 rename to releases/specs/hppa/netboot2-hppa32.spec
1905 index b2e87aac..f1f73591 100644
1906 --- a/releases/weekly/specs/hppa/netboot2-hppa32.spec
1907 +++ b/releases/specs/hppa/netboot2-hppa32.spec
1908 @@ -13,7 +13,7 @@ profile: default/linux/hppa/17.0
1909 # netboot2 stuff
1910 boot/kernel: netboot32
1911 boot/kernel/netboot32/sources: sys-kernel/gentoo-sources
1912 -boot/kernel/netboot32/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
1913 +boot/kernel/netboot32/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
1914 boot/kernel/netboot32/gk_kernargs: --all-ramdisk-modules
1915
1916 netboot2/use:
1917
1918 diff --git a/releases/weekly/specs/hppa/netboot2-hppa64.spec b/releases/specs/hppa/netboot2-hppa64.spec
1919 similarity index 97%
1920 rename from releases/weekly/specs/hppa/netboot2-hppa64.spec
1921 rename to releases/specs/hppa/netboot2-hppa64.spec
1922 index acaae4e0..529ab6a5 100644
1923 --- a/releases/weekly/specs/hppa/netboot2-hppa64.spec
1924 +++ b/releases/specs/hppa/netboot2-hppa64.spec
1925 @@ -12,7 +12,7 @@ profile: default/linux/hppa/17.0
1926
1927 boot/kernel: netboot64
1928 boot/kernel/netboot64/sources: sys-kernel/gentoo-sources
1929 -boot/kernel/netboot64/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
1930 +boot/kernel/netboot64/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
1931 boot/kernel/netboot64/gk_kernargs: --cross-compile=hppa64-unknown-linux-gnu --all-ramdisk-modules
1932
1933 netboot2/use:
1934
1935 diff --git a/releases/weekly/specs/ia64/installcd-stage1.spec b/releases/specs/ia64/installcd-stage1.spec
1936 similarity index 97%
1937 rename from releases/weekly/specs/ia64/installcd-stage1.spec
1938 rename to releases/specs/ia64/installcd-stage1.spec
1939 index 688f03f9..fc6f1997 100644
1940 --- a/releases/weekly/specs/ia64/installcd-stage1.spec
1941 +++ b/releases/specs/ia64/installcd-stage1.spec
1942 @@ -7,7 +7,7 @@ snapshot: latest
1943 source_subpath: default/stage3-ia64-latest
1944 compression_mode: pixz_x
1945 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1946 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1947 +portage_confdir: @REPO_DIR@/releases/portage/isos
1948
1949 livecd/use:
1950 compile-locales
1951
1952 diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/specs/ia64/installcd-stage2-minimal.spec
1953 similarity index 99%
1954 rename from releases/weekly/specs/ia64/installcd-stage2-minimal.spec
1955 rename to releases/specs/ia64/installcd-stage2-minimal.spec
1956 index 0ec44e11..fb6c99bb 100644
1957 --- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
1958 +++ b/releases/specs/ia64/installcd-stage2-minimal.spec
1959 @@ -7,7 +7,7 @@ snapshot: latest
1960 source_subpath: default/livecd-stage1-ia64-latest
1961 compression_mode: pixz_x
1962 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1963 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
1964 +portage_confdir: @REPO_DIR@/releases/portage/isos
1965
1966 livecd/bootargs: dokeymap
1967 livecd/fstype: squashfs
1968
1969 diff --git a/releases/weekly/specs/ia64/stage1.spec b/releases/specs/ia64/stage1.spec
1970 similarity index 84%
1971 rename from releases/weekly/specs/ia64/stage1.spec
1972 rename to releases/specs/ia64/stage1.spec
1973 index c44e8fb9..d3d4a319 100644
1974 --- a/releases/weekly/specs/ia64/stage1.spec
1975 +++ b/releases/specs/ia64/stage1.spec
1976 @@ -9,5 +9,5 @@ compression_mode: pixz_x
1977 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1978 update_seed: yes
1979 update_seed_command: --update --deep @world
1980 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1981 +portage_confdir: @REPO_DIR@/releases/portage/stages
1982 portage_prefix: releng
1983
1984 diff --git a/releases/weekly/specs/ia64/stage2.spec b/releases/specs/ia64/stage2.spec
1985 similarity index 81%
1986 rename from releases/weekly/specs/ia64/stage2.spec
1987 rename to releases/specs/ia64/stage2.spec
1988 index 3e9ed6df..c533701b 100644
1989 --- a/releases/weekly/specs/ia64/stage2.spec
1990 +++ b/releases/specs/ia64/stage2.spec
1991 @@ -7,5 +7,5 @@ snapshot: latest
1992 source_subpath: default/stage1-ia64-latest
1993 compression_mode: pixz_x
1994 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
1995 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
1996 +portage_confdir: @REPO_DIR@/releases/portage/stages
1997 portage_prefix: releng
1998
1999 diff --git a/releases/weekly/specs/ia64/stage3.spec b/releases/specs/ia64/stage3.spec
2000 similarity index 81%
2001 rename from releases/weekly/specs/ia64/stage3.spec
2002 rename to releases/specs/ia64/stage3.spec
2003 index b8c457fc..c4ebd808 100644
2004 --- a/releases/weekly/specs/ia64/stage3.spec
2005 +++ b/releases/specs/ia64/stage3.spec
2006 @@ -7,5 +7,5 @@ snapshot: latest
2007 source_subpath: default/stage1-ia64-latest
2008 compression_mode: pixz_x
2009 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2010 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2011 +portage_confdir: @REPO_DIR@/releases/portage/stages
2012 portage_prefix: releng
2013
2014 diff --git a/releases/weekly/specs/mips/mips3/netboot.spec b/releases/specs/mips/mips3/netboot.spec
2015 similarity index 100%
2016 rename from releases/weekly/specs/mips/mips3/netboot.spec
2017 rename to releases/specs/mips/mips3/netboot.spec
2018
2019 diff --git a/releases/weekly/specs/mips/mips3/stage1.spec b/releases/specs/mips/mips3/stage1.spec
2020 similarity index 100%
2021 rename from releases/weekly/specs/mips/mips3/stage1.spec
2022 rename to releases/specs/mips/mips3/stage1.spec
2023
2024 diff --git a/releases/weekly/specs/mips/mips3/stage2.spec b/releases/specs/mips/mips3/stage2.spec
2025 similarity index 100%
2026 rename from releases/weekly/specs/mips/mips3/stage2.spec
2027 rename to releases/specs/mips/mips3/stage2.spec
2028
2029 diff --git a/releases/weekly/specs/mips/mips3/stage3.spec b/releases/specs/mips/mips3/stage3.spec
2030 similarity index 100%
2031 rename from releases/weekly/specs/mips/mips3/stage3.spec
2032 rename to releases/specs/mips/mips3/stage3.spec
2033
2034 diff --git a/releases/weekly/specs/mips/mips4/stage1.spec b/releases/specs/mips/mips4/stage1.spec
2035 similarity index 100%
2036 rename from releases/weekly/specs/mips/mips4/stage1.spec
2037 rename to releases/specs/mips/mips4/stage1.spec
2038
2039 diff --git a/releases/weekly/specs/mips/mips4/stage2.spec b/releases/specs/mips/mips4/stage2.spec
2040 similarity index 100%
2041 rename from releases/weekly/specs/mips/mips4/stage2.spec
2042 rename to releases/specs/mips/mips4/stage2.spec
2043
2044 diff --git a/releases/weekly/specs/mips/mips4/stage3.spec b/releases/specs/mips/mips4/stage3.spec
2045 similarity index 100%
2046 rename from releases/weekly/specs/mips/mips4/stage3.spec
2047 rename to releases/specs/mips/mips4/stage3.spec
2048
2049 diff --git a/releases/weekly/specs/ppc/ppc32/g4/stage2.spec b/releases/specs/ppc/ppc32/g4/stage2.spec
2050 similarity index 100%
2051 rename from releases/weekly/specs/ppc/ppc32/g4/stage2.spec
2052 rename to releases/specs/ppc/ppc32/g4/stage2.spec
2053
2054 diff --git a/releases/weekly/specs/ppc/ppc32/g4/stage3.spec b/releases/specs/ppc/ppc32/g4/stage3.spec
2055 similarity index 100%
2056 rename from releases/weekly/specs/ppc/ppc32/g4/stage3.spec
2057 rename to releases/specs/ppc/ppc32/g4/stage3.spec
2058
2059 diff --git a/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec
2060 similarity index 96%
2061 rename from releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
2062 rename to releases/specs/ppc/ppc32/installcd-stage1.spec
2063 index ec8b427f..d11c0790 100644
2064 --- a/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
2065 +++ b/releases/specs/ppc/ppc32/installcd-stage1.spec
2066 @@ -7,7 +7,7 @@ snapshot: 2008.0
2067 source_subpath: default/stage3-ppc-2008.0
2068 compression_mode: pixz_x
2069 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2070 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2071 +portage_confdir: @REPO_DIR@/releases/portage/isos
2072
2073 livecd/use:
2074 compile-locales
2075
2076 diff --git a/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
2077 similarity index 99%
2078 rename from releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
2079 rename to releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
2080 index 862647d6..f219c413 100644
2081 --- a/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
2082 +++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
2083 @@ -5,7 +5,7 @@ rel_type: default
2084 profile: default/linux/powerpc/ppc32/17.0
2085 snapshot: 2008.0
2086 source_subpath: default/livecd-stage1-ppc-2008.0
2087 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2088 +portage_confdir: @REPO_DIR@/releases/portage/isos
2089
2090 livecd/fstype: squashfs
2091 livecd/gk_mainargs: --makeopts=-j12
2092
2093 diff --git a/releases/weekly/specs/ppc/ppc32/stage1.spec b/releases/specs/ppc/ppc32/stage1.spec
2094 similarity index 85%
2095 rename from releases/weekly/specs/ppc/ppc32/stage1.spec
2096 rename to releases/specs/ppc/ppc32/stage1.spec
2097 index 227d2ecb..d4192502 100644
2098 --- a/releases/weekly/specs/ppc/ppc32/stage1.spec
2099 +++ b/releases/specs/ppc/ppc32/stage1.spec
2100 @@ -9,4 +9,4 @@ compression_mode: pixz_x
2101 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2102 update_seed: yes
2103 update_seed_command: --update --deep @world --jobs 5 --load-average 5
2104 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2105 +portage_confdir: @REPO_DIR@/releases/portage/stages
2106
2107 diff --git a/releases/weekly/specs/ppc/ppc32/stage2.spec b/releases/specs/ppc/ppc32/stage2.spec
2108 similarity index 80%
2109 rename from releases/weekly/specs/ppc/ppc32/stage2.spec
2110 rename to releases/specs/ppc/ppc32/stage2.spec
2111 index 0ffbe4b6..9640b66e 100644
2112 --- a/releases/weekly/specs/ppc/ppc32/stage2.spec
2113 +++ b/releases/specs/ppc/ppc32/stage2.spec
2114 @@ -7,4 +7,4 @@ snapshot: 2008.0
2115 source_subpath: default/stage1-ppc-2008.0
2116 compression_mode: pixz_x
2117 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2118 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2119 +portage_confdir: @REPO_DIR@/releases/portage/stages
2120
2121 diff --git a/releases/weekly/specs/ppc/ppc32/stage3.spec b/releases/specs/ppc/ppc32/stage3.spec
2122 similarity index 80%
2123 rename from releases/weekly/specs/ppc/ppc32/stage3.spec
2124 rename to releases/specs/ppc/ppc32/stage3.spec
2125 index 567a675c..13b01082 100644
2126 --- a/releases/weekly/specs/ppc/ppc32/stage3.spec
2127 +++ b/releases/specs/ppc/ppc32/stage3.spec
2128 @@ -7,4 +7,4 @@ snapshot: 2008.0
2129 source_subpath: default/stage1-ppc-2008.0
2130 compression_mode: pixz_x
2131 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2132 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2133 +portage_confdir: @REPO_DIR@/releases/portage/stages
2134
2135 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage1.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage1.spec
2136 similarity index 100%
2137 rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage1.spec
2138 rename to releases/specs/ppc/ppc32/uclibc/hardened/stage1.spec
2139
2140 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage2.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage2.spec
2141 similarity index 100%
2142 rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage2.spec
2143 rename to releases/specs/ppc/ppc32/uclibc/hardened/stage2.spec
2144
2145 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage3.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage3.spec
2146 similarity index 100%
2147 rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage3.spec
2148 rename to releases/specs/ppc/ppc32/uclibc/hardened/stage3.spec
2149
2150 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage1.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage1.spec
2151 similarity index 100%
2152 rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage1.spec
2153 rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage1.spec
2154
2155 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage2.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage2.spec
2156 similarity index 100%
2157 rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage2.spec
2158 rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage2.spec
2159
2160 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage3.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage3.spec
2161 similarity index 100%
2162 rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage3.spec
2163 rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage3.spec
2164
2165 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage1.spec b/releases/specs/ppc/ppc32/uclibc/stage1.spec
2166 similarity index 100%
2167 rename from releases/weekly/specs/ppc/ppc32/uclibc/stage1.spec
2168 rename to releases/specs/ppc/ppc32/uclibc/stage1.spec
2169
2170 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage2.spec b/releases/specs/ppc/ppc32/uclibc/stage2.spec
2171 similarity index 100%
2172 rename from releases/weekly/specs/ppc/ppc32/uclibc/stage2.spec
2173 rename to releases/specs/ppc/ppc32/uclibc/stage2.spec
2174
2175 diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage3.spec b/releases/specs/ppc/ppc32/uclibc/stage3.spec
2176 similarity index 100%
2177 rename from releases/weekly/specs/ppc/ppc32/uclibc/stage3.spec
2178 rename to releases/specs/ppc/ppc32/uclibc/stage3.spec
2179
2180 diff --git a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec b/releases/specs/ppc/ppc64/stage1-32ul.spec
2181 similarity index 87%
2182 rename from releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
2183 rename to releases/specs/ppc/ppc64/stage1-32ul.spec
2184 index 49cc2cc2..fbbb9a28 100644
2185 --- a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
2186 +++ b/releases/specs/ppc/ppc64/stage1-32ul.spec
2187 @@ -10,4 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2188 update_seed: yes
2189 update_seed_command: --update --deep @world --jobs 5 --load-average 5
2190 chost: powerpc-unknown-linux-gnu
2191 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2192 +portage_confdir: @REPO_DIR@/releases/portage/stages
2193
2194 diff --git a/releases/weekly/specs/ppc/ppc64/stage1.spec b/releases/specs/ppc/ppc64/stage1.spec
2195 similarity index 85%
2196 rename from releases/weekly/specs/ppc/ppc64/stage1.spec
2197 rename to releases/specs/ppc/ppc64/stage1.spec
2198 index a727fe7e..dfac6d1b 100644
2199 --- a/releases/weekly/specs/ppc/ppc64/stage1.spec
2200 +++ b/releases/specs/ppc/ppc64/stage1.spec
2201 @@ -9,4 +9,4 @@ compression_mode: pixz_x
2202 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2203 update_seed: yes
2204 update_seed_command: --update --deep @world --jobs 5 --load-average 5
2205 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2206 +portage_confdir: @REPO_DIR@/releases/portage/stages
2207
2208 diff --git a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec b/releases/specs/ppc/ppc64/stage2-32ul.spec
2209 similarity index 84%
2210 rename from releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
2211 rename to releases/specs/ppc/ppc64/stage2-32ul.spec
2212 index ebe47d89..871fd498 100644
2213 --- a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
2214 +++ b/releases/specs/ppc/ppc64/stage2-32ul.spec
2215 @@ -8,4 +8,4 @@ source_subpath: default/stage1-ppc64-32ul-2008.0
2216 compression_mode: pixz_x
2217 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2218 chost: powerpc-unknown-linux-gnu
2219 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2220 +portage_confdir: @REPO_DIR@/releases/portage/stages
2221
2222 diff --git a/releases/weekly/specs/ppc/ppc64/stage2.spec b/releases/specs/ppc/ppc64/stage2.spec
2223 similarity index 82%
2224 rename from releases/weekly/specs/ppc/ppc64/stage2.spec
2225 rename to releases/specs/ppc/ppc64/stage2.spec
2226 index dc5b9dc5..0452729f 100644
2227 --- a/releases/weekly/specs/ppc/ppc64/stage2.spec
2228 +++ b/releases/specs/ppc/ppc64/stage2.spec
2229 @@ -7,4 +7,4 @@ snapshot: 2008.0
2230 source_subpath: default/stage1-ppc64-2008.0
2231 compression_mode: pixz_x
2232 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2233 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2234 +portage_confdir: @REPO_DIR@/releases/portage/stages
2235
2236 diff --git a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec b/releases/specs/ppc/ppc64/stage3-32ul.spec
2237 similarity index 82%
2238 rename from releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
2239 rename to releases/specs/ppc/ppc64/stage3-32ul.spec
2240 index cbd241ec..d5ac2811 100644
2241 --- a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
2242 +++ b/releases/specs/ppc/ppc64/stage3-32ul.spec
2243 @@ -7,4 +7,4 @@ snapshot: 2008.0
2244 source_subpath: default/stage1-ppc64-32ul-2008.0
2245 compression_mode: pixz_x
2246 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2247 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2248 +portage_confdir: @REPO_DIR@/releases/portage/stages
2249
2250 diff --git a/releases/weekly/specs/ppc/ppc64/stage3.spec b/releases/specs/ppc/ppc64/stage3.spec
2251 similarity index 82%
2252 rename from releases/weekly/specs/ppc/ppc64/stage3.spec
2253 rename to releases/specs/ppc/ppc64/stage3.spec
2254 index 6dad59ac..f0f1eef0 100644
2255 --- a/releases/weekly/specs/ppc/ppc64/stage3.spec
2256 +++ b/releases/specs/ppc/ppc64/stage3.spec
2257 @@ -7,4 +7,4 @@ snapshot: 2008.0
2258 source_subpath: default/stage1-ppc64-2008.0
2259 compression_mode: pixz_x
2260 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2261 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2262 +portage_confdir: @REPO_DIR@/releases/portage/stages
2263
2264 diff --git a/releases/weekly/specs/ppc/ppc64le/stage1.spec b/releases/specs/ppc/ppc64le/stage1.spec
2265 similarity index 85%
2266 rename from releases/weekly/specs/ppc/ppc64le/stage1.spec
2267 rename to releases/specs/ppc/ppc64le/stage1.spec
2268 index 0594f2d8..c6df1aa9 100644
2269 --- a/releases/weekly/specs/ppc/ppc64le/stage1.spec
2270 +++ b/releases/specs/ppc/ppc64le/stage1.spec
2271 @@ -9,4 +9,4 @@ compression_mode: pixz_x
2272 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2273 update_seed: yes
2274 update_seed_command: --update --deep @world --jobs 5 --load-average 5
2275 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2276 +portage_confdir: @REPO_DIR@/releases/portage/stages
2277
2278 diff --git a/releases/weekly/specs/ppc/ppc64le/stage3.spec b/releases/specs/ppc/ppc64le/stage3.spec
2279 similarity index 81%
2280 rename from releases/weekly/specs/ppc/ppc64le/stage3.spec
2281 rename to releases/specs/ppc/ppc64le/stage3.spec
2282 index 3af43553..99e075b3 100644
2283 --- a/releases/weekly/specs/ppc/ppc64le/stage3.spec
2284 +++ b/releases/specs/ppc/ppc64le/stage3.spec
2285 @@ -7,4 +7,4 @@ snapshot: latest
2286 source_subpath: default/stage1-ppc64le-latest
2287 compression_mode: pixz_x
2288 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2289 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2290 +portage_confdir: @REPO_DIR@/releases/portage/stages
2291
2292 diff --git a/releases/weekly/specs/s390/s390/netboot/misc/gentoo.exec b/releases/specs/s390/s390/netboot/misc/gentoo.exec
2293 similarity index 100%
2294 rename from releases/weekly/specs/s390/s390/netboot/misc/gentoo.exec
2295 rename to releases/specs/s390/s390/netboot/misc/gentoo.exec
2296
2297 diff --git a/releases/weekly/specs/s390/s390/netboot/misc/gentoo.parmfile b/releases/specs/s390/s390/netboot/misc/gentoo.parmfile
2298 similarity index 100%
2299 rename from releases/weekly/specs/s390/s390/netboot/misc/gentoo.parmfile
2300 rename to releases/specs/s390/s390/netboot/misc/gentoo.parmfile
2301
2302 diff --git a/releases/weekly/specs/s390/s390/netboot/netboot.spec b/releases/specs/s390/s390/netboot/netboot.spec
2303 similarity index 98%
2304 rename from releases/weekly/specs/s390/s390/netboot/netboot.spec
2305 rename to releases/specs/s390/s390/netboot/netboot.spec
2306 index e262711d..f7970a01 100644
2307 --- a/releases/weekly/specs/s390/s390/netboot/netboot.spec
2308 +++ b/releases/specs/s390/s390/netboot/netboot.spec
2309 @@ -9,7 +9,7 @@ target: netboot2
2310 subarch: s390
2311 rel_type: default
2312 profile: default/linux/s390/17.0
2313 -portage_confdir: @REPO_DIR@/releases/weekly/specs/s390/s390/netboot/portage
2314 +portage_confdir: @REPO_DIR@/releases/specs/s390/s390/netboot/portage
2315
2316
2317 boot/kernel: netboot
2318
2319 diff --git a/releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources b/releases/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources
2320 similarity index 100%
2321 rename from releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources
2322 rename to releases/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources
2323
2324 diff --git a/releases/weekly/specs/s390/s390/netboot/portage/package.use/genkernel b/releases/specs/s390/s390/netboot/portage/package.use/genkernel
2325 similarity index 100%
2326 rename from releases/weekly/specs/s390/s390/netboot/portage/package.use/genkernel
2327 rename to releases/specs/s390/s390/netboot/portage/package.use/genkernel
2328
2329 diff --git a/releases/weekly/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch b/releases/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2330 similarity index 100%
2331 rename from releases/weekly/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2332 rename to releases/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2333
2334 diff --git a/releases/weekly/specs/s390/s390/stage1.spec b/releases/specs/s390/s390/stage1.spec
2335 similarity index 86%
2336 rename from releases/weekly/specs/s390/s390/stage1.spec
2337 rename to releases/specs/s390/s390/stage1.spec
2338 index 41637d54..9f6daefe 100644
2339 --- a/releases/weekly/specs/s390/s390/stage1.spec
2340 +++ b/releases/specs/s390/s390/stage1.spec
2341 @@ -9,5 +9,5 @@ update_seed: yes
2342 update_seed_command: --update --deep @world --jobs 2 --load-average 2
2343 compression_mode: pixz_x
2344 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2345 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2346 +portage_confdir: @REPO_DIR@/releases/portage/stages
2347 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390
2348
2349 diff --git a/releases/weekly/specs/s390/s390/stage2.spec b/releases/specs/s390/s390/stage2.spec
2350 similarity index 83%
2351 rename from releases/weekly/specs/s390/s390/stage2.spec
2352 rename to releases/specs/s390/s390/stage2.spec
2353 index 01cc2a15..45054936 100644
2354 --- a/releases/weekly/specs/s390/s390/stage2.spec
2355 +++ b/releases/specs/s390/s390/stage2.spec
2356 @@ -7,5 +7,5 @@ snapshot: 2008.0
2357 source_subpath: default/stage1-s390-2008.0
2358 compression_mode: pixz_x
2359 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2360 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2361 +portage_confdir: @REPO_DIR@/releases/portage/stages
2362 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-s390
2363
2364 diff --git a/releases/weekly/specs/s390/s390/stage3.spec b/releases/specs/s390/s390/stage3.spec
2365 similarity index 83%
2366 rename from releases/weekly/specs/s390/s390/stage3.spec
2367 rename to releases/specs/s390/s390/stage3.spec
2368 index cac20044..61aeb976 100644
2369 --- a/releases/weekly/specs/s390/s390/stage3.spec
2370 +++ b/releases/specs/s390/s390/stage3.spec
2371 @@ -7,5 +7,5 @@ snapshot: 2008.0
2372 source_subpath: default/stage1-s390-2008.0
2373 compression_mode: pixz_x
2374 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2375 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2376 +portage_confdir: @REPO_DIR@/releases/portage/stages
2377 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390
2378
2379 diff --git a/releases/weekly/specs/s390/s390x/netboot/misc/gentoo.exec b/releases/specs/s390/s390x/netboot/misc/gentoo.exec
2380 similarity index 100%
2381 rename from releases/weekly/specs/s390/s390x/netboot/misc/gentoo.exec
2382 rename to releases/specs/s390/s390x/netboot/misc/gentoo.exec
2383
2384 diff --git a/releases/weekly/specs/s390/s390x/netboot/misc/gentoo.parmfile b/releases/specs/s390/s390x/netboot/misc/gentoo.parmfile
2385 similarity index 100%
2386 rename from releases/weekly/specs/s390/s390x/netboot/misc/gentoo.parmfile
2387 rename to releases/specs/s390/s390x/netboot/misc/gentoo.parmfile
2388
2389 diff --git a/releases/weekly/specs/s390/s390x/netboot/netboot.spec b/releases/specs/s390/s390x/netboot/netboot.spec
2390 similarity index 98%
2391 rename from releases/weekly/specs/s390/s390x/netboot/netboot.spec
2392 rename to releases/specs/s390/s390x/netboot/netboot.spec
2393 index 4f578ab5..7c5936f4 100644
2394 --- a/releases/weekly/specs/s390/s390x/netboot/netboot.spec
2395 +++ b/releases/specs/s390/s390x/netboot/netboot.spec
2396 @@ -9,7 +9,7 @@ target: netboot2
2397 subarch: s390x
2398 rel_type: default
2399 profile: default/linux/s390/17.0/s390x
2400 -portage_confdir: @REPO_DIR@/releases/weekly/specs/s390/s390x/netboot/portage
2401 +portage_confdir: @REPO_DIR@/releases/specs/s390/s390x/netboot/portage
2402
2403
2404 boot/kernel: netboot64
2405
2406 diff --git a/releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources b/releases/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources
2407 similarity index 100%
2408 rename from releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources
2409 rename to releases/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources
2410
2411 diff --git a/releases/weekly/specs/s390/s390x/netboot/portage/package.use/genkernel b/releases/specs/s390/s390x/netboot/portage/package.use/genkernel
2412 similarity index 100%
2413 rename from releases/weekly/specs/s390/s390x/netboot/portage/package.use/genkernel
2414 rename to releases/specs/s390/s390x/netboot/portage/package.use/genkernel
2415
2416 diff --git a/releases/weekly/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch b/releases/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2417 similarity index 100%
2418 rename from releases/weekly/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2419 rename to releases/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch
2420
2421 diff --git a/releases/weekly/specs/s390/s390x/stage1.spec b/releases/specs/s390/s390x/stage1.spec
2422 similarity index 87%
2423 rename from releases/weekly/specs/s390/s390x/stage1.spec
2424 rename to releases/specs/s390/s390x/stage1.spec
2425 index 98c5a353..207b4682 100644
2426 --- a/releases/weekly/specs/s390/s390x/stage1.spec
2427 +++ b/releases/specs/s390/s390x/stage1.spec
2428 @@ -9,5 +9,5 @@ update_seed: yes
2429 update_seed_command: --update --deep @world --jobs 2 --load-average 2
2430 compression_mode: pixz_x
2431 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2432 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2433 +portage_confdir: @REPO_DIR@/releases/portage/stages
2434 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390x
2435
2436 diff --git a/releases/weekly/specs/s390/s390x/stage2.spec b/releases/specs/s390/s390x/stage2.spec
2437 similarity index 84%
2438 rename from releases/weekly/specs/s390/s390x/stage2.spec
2439 rename to releases/specs/s390/s390x/stage2.spec
2440 index e92cec56..298ea47c 100644
2441 --- a/releases/weekly/specs/s390/s390x/stage2.spec
2442 +++ b/releases/specs/s390/s390x/stage2.spec
2443 @@ -7,5 +7,5 @@ snapshot: 2008.0
2444 source_subpath: default/stage1-s390x-2008.0
2445 compression_mode: pixz_x
2446 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2447 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2448 +portage_confdir: @REPO_DIR@/releases/portage/stages
2449 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-s390x
2450
2451 diff --git a/releases/weekly/specs/s390/s390x/stage3.spec b/releases/specs/s390/s390x/stage3.spec
2452 similarity index 84%
2453 rename from releases/weekly/specs/s390/s390x/stage3.spec
2454 rename to releases/specs/s390/s390x/stage3.spec
2455 index ff34ed10..e655b52c 100644
2456 --- a/releases/weekly/specs/s390/s390x/stage3.spec
2457 +++ b/releases/specs/s390/s390x/stage3.spec
2458 @@ -7,5 +7,5 @@ snapshot: 2008.0
2459 source_subpath: default/stage1-s390x-2008.0
2460 compression_mode: pixz_x
2461 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2462 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2463 +portage_confdir: @REPO_DIR@/releases/portage/stages
2464 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
2465
2466 diff --git a/releases/weekly/specs/sh/sh4/stage1.spec b/releases/specs/sh/sh4/stage1.spec
2467 similarity index 100%
2468 rename from releases/weekly/specs/sh/sh4/stage1.spec
2469 rename to releases/specs/sh/sh4/stage1.spec
2470
2471 diff --git a/releases/weekly/specs/sh/sh4/stage2.spec b/releases/specs/sh/sh4/stage2.spec
2472 similarity index 100%
2473 rename from releases/weekly/specs/sh/sh4/stage2.spec
2474 rename to releases/specs/sh/sh4/stage2.spec
2475
2476 diff --git a/releases/weekly/specs/sh/sh4/stage3.spec b/releases/specs/sh/sh4/stage3.spec
2477 similarity index 100%
2478 rename from releases/weekly/specs/sh/sh4/stage3.spec
2479 rename to releases/specs/sh/sh4/stage3.spec
2480
2481 diff --git a/releases/weekly/specs/sh/sh4a/stage1.spec b/releases/specs/sh/sh4a/stage1.spec
2482 similarity index 100%
2483 rename from releases/weekly/specs/sh/sh4a/stage1.spec
2484 rename to releases/specs/sh/sh4a/stage1.spec
2485
2486 diff --git a/releases/weekly/specs/sh/sh4a/stage2.spec b/releases/specs/sh/sh4a/stage2.spec
2487 similarity index 100%
2488 rename from releases/weekly/specs/sh/sh4a/stage2.spec
2489 rename to releases/specs/sh/sh4a/stage2.spec
2490
2491 diff --git a/releases/weekly/specs/sh/sh4a/stage3.spec b/releases/specs/sh/sh4a/stage3.spec
2492 similarity index 100%
2493 rename from releases/weekly/specs/sh/sh4a/stage3.spec
2494 rename to releases/specs/sh/sh4a/stage3.spec
2495
2496 diff --git a/releases/weekly/specs/sparc/sparc/stage1.spec b/releases/specs/sparc/sparc/stage1.spec
2497 similarity index 84%
2498 rename from releases/weekly/specs/sparc/sparc/stage1.spec
2499 rename to releases/specs/sparc/sparc/stage1.spec
2500 index 118f2c10..0f9c12ad 100644
2501 --- a/releases/weekly/specs/sparc/sparc/stage1.spec
2502 +++ b/releases/specs/sparc/sparc/stage1.spec
2503 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2504 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2505 update_seed: yes
2506 update_seed_command: --update --deep @world
2507 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2508 +portage_confdir: @REPO_DIR@/releases/portage/stages
2509 portage_prefix: releng
2510
2511 diff --git a/releases/weekly/specs/sparc/sparc/stage2.spec b/releases/specs/sparc/sparc/stage2.spec
2512 similarity index 82%
2513 rename from releases/weekly/specs/sparc/sparc/stage2.spec
2514 rename to releases/specs/sparc/sparc/stage2.spec
2515 index 0aee1eed..00fe33c0 100644
2516 --- a/releases/weekly/specs/sparc/sparc/stage2.spec
2517 +++ b/releases/specs/sparc/sparc/stage2.spec
2518 @@ -7,5 +7,5 @@ snapshot: latest
2519 source_subpath: default/stage1-sparc-latest
2520 compression_mode: pixz_x
2521 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2522 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2523 +portage_confdir: @REPO_DIR@/releases/portage/stages
2524 portage_prefix: releng
2525
2526 diff --git a/releases/weekly/specs/sparc/sparc/stage3.spec b/releases/specs/sparc/sparc/stage3.spec
2527 similarity index 82%
2528 rename from releases/weekly/specs/sparc/sparc/stage3.spec
2529 rename to releases/specs/sparc/sparc/stage3.spec
2530 index b96dbadc..6d08344a 100644
2531 --- a/releases/weekly/specs/sparc/sparc/stage3.spec
2532 +++ b/releases/specs/sparc/sparc/stage3.spec
2533 @@ -7,5 +7,5 @@ snapshot: latest
2534 source_subpath: default/stage1-sparc-latest
2535 compression_mode: pixz_x
2536 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2537 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2538 +portage_confdir: @REPO_DIR@/releases/portage/stages
2539 portage_prefix: releng
2540
2541 diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage1.spec b/releases/specs/sparc/sparc/systemd-stage1.spec
2542 similarity index 85%
2543 rename from releases/weekly/specs/sparc/sparc/systemd-stage1.spec
2544 rename to releases/specs/sparc/sparc/systemd-stage1.spec
2545 index addba4d1..7bdb63dd 100644
2546 --- a/releases/weekly/specs/sparc/sparc/systemd-stage1.spec
2547 +++ b/releases/specs/sparc/sparc/systemd-stage1.spec
2548 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2549 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2550 update_seed: yes
2551 update_seed_command: --update --deep @world
2552 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2553 +portage_confdir: @REPO_DIR@/releases/portage/stages
2554 portage_prefix: releng
2555
2556 diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage2.spec b/releases/specs/sparc/sparc/systemd-stage2.spec
2557 similarity index 83%
2558 rename from releases/weekly/specs/sparc/sparc/systemd-stage2.spec
2559 rename to releases/specs/sparc/sparc/systemd-stage2.spec
2560 index 81cfc480..1ec28640 100644
2561 --- a/releases/weekly/specs/sparc/sparc/systemd-stage2.spec
2562 +++ b/releases/specs/sparc/sparc/systemd-stage2.spec
2563 @@ -7,5 +7,5 @@ snapshot: latest
2564 source_subpath: default/stage1-sparc-systemd-latest
2565 compression_mode: pixz_x
2566 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2567 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2568 +portage_confdir: @REPO_DIR@/releases/portage/stages
2569 portage_prefix: releng
2570
2571 diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage3.spec b/releases/specs/sparc/sparc/systemd-stage3.spec
2572 similarity index 83%
2573 rename from releases/weekly/specs/sparc/sparc/systemd-stage3.spec
2574 rename to releases/specs/sparc/sparc/systemd-stage3.spec
2575 index 8d0e15df..df9d9c3a 100644
2576 --- a/releases/weekly/specs/sparc/sparc/systemd-stage3.spec
2577 +++ b/releases/specs/sparc/sparc/systemd-stage3.spec
2578 @@ -7,5 +7,5 @@ snapshot: latest
2579 source_subpath: default/stage1-sparc-systemd-latest
2580 compression_mode: pixz_x
2581 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2582 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2583 +portage_confdir: @REPO_DIR@/releases/portage/stages
2584 portage_prefix: releng
2585
2586 diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec b/releases/specs/sparc/sparc64/installcd-stage1.spec
2587 similarity index 96%
2588 rename from releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
2589 rename to releases/specs/sparc/sparc64/installcd-stage1.spec
2590 index fe8954a4..9d4aa5a7 100644
2591 --- a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
2592 +++ b/releases/specs/sparc/sparc64/installcd-stage1.spec
2593 @@ -6,7 +6,7 @@ profile: default/linux/sparc/17.0/64ul
2594 snapshot: latest
2595 source_subpath: default/stage3-sparc64-latest
2596 compression_mode: pixz_x
2597 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2598 +portage_confdir: @REPO_DIR@/releases/portage/isos
2599
2600 livecd/use:
2601 compile-locales
2602
2603 diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
2604 similarity index 97%
2605 rename from releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
2606 rename to releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
2607 index 39f7c2a8..e8d4d71c 100644
2608 --- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
2609 +++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
2610 @@ -5,7 +5,7 @@ rel_type: default
2611 profile: default/linux/sparc/17.0/64ul
2612 snapshot: latest
2613 source_subpath: default/livecd-stage1-sparc64-latest
2614 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2615 +portage_confdir: @REPO_DIR@/releases/portage/isos
2616
2617 livecd/bootargs: dokeymap
2618 livecd/fstype: squashfs
2619 @@ -17,7 +17,7 @@ livecd/gk_mainargs: --firmware-files=ql2200_fw.bin --makeopts=-j256
2620 boot/kernel: gentoo
2621
2622 boot/kernel/gentoo/sources: gentoo-sources
2623 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/sparc/installcd-4.19.44.config
2624 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/sparc/installcd-4.19.44.config
2625
2626 livecd/unmerge:
2627 app-admin/eselect
2628
2629 diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec b/releases/specs/sparc/sparc64/multilib/stage1.spec
2630 similarity index 100%
2631 rename from releases/weekly/specs/sparc/sparc64/multilib/stage1.spec
2632 rename to releases/specs/sparc/sparc64/multilib/stage1.spec
2633
2634 diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage2.spec b/releases/specs/sparc/sparc64/multilib/stage2.spec
2635 similarity index 100%
2636 rename from releases/weekly/specs/sparc/sparc64/multilib/stage2.spec
2637 rename to releases/specs/sparc/sparc64/multilib/stage2.spec
2638
2639 diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec b/releases/specs/sparc/sparc64/multilib/stage3.spec
2640 similarity index 100%
2641 rename from releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
2642 rename to releases/specs/sparc/sparc64/multilib/stage3.spec
2643
2644 diff --git a/releases/weekly/specs/sparc/sparc64/netboot.spec b/releases/specs/sparc/sparc64/netboot.spec
2645 similarity index 100%
2646 rename from releases/weekly/specs/sparc/sparc64/netboot.spec
2647 rename to releases/specs/sparc/sparc64/netboot.spec
2648
2649 diff --git a/releases/weekly/specs/sparc/sparc64/stage1.spec b/releases/specs/sparc/sparc64/stage1.spec
2650 similarity index 85%
2651 rename from releases/weekly/specs/sparc/sparc64/stage1.spec
2652 rename to releases/specs/sparc/sparc64/stage1.spec
2653 index 0f4a4934..b14dcac9 100644
2654 --- a/releases/weekly/specs/sparc/sparc64/stage1.spec
2655 +++ b/releases/specs/sparc/sparc64/stage1.spec
2656 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2657 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2658 update_seed: yes
2659 update_seed_command: --update --deep @world
2660 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2661 +portage_confdir: @REPO_DIR@/releases/portage/stages
2662 portage_prefix: releng
2663
2664 diff --git a/releases/weekly/specs/sparc/sparc64/stage2.spec b/releases/specs/sparc/sparc64/stage2.spec
2665 similarity index 82%
2666 rename from releases/weekly/specs/sparc/sparc64/stage2.spec
2667 rename to releases/specs/sparc/sparc64/stage2.spec
2668 index c492f2cb..17aee7fb 100644
2669 --- a/releases/weekly/specs/sparc/sparc64/stage2.spec
2670 +++ b/releases/specs/sparc/sparc64/stage2.spec
2671 @@ -7,5 +7,5 @@ snapshot: latest
2672 source_subpath: default/stage1-sparc64-latest
2673 compression_mode: pixz_x
2674 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2675 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2676 +portage_confdir: @REPO_DIR@/releases/portage/stages
2677 portage_prefix: releng
2678
2679 diff --git a/releases/weekly/specs/sparc/sparc64/stage3.spec b/releases/specs/sparc/sparc64/stage3.spec
2680 similarity index 82%
2681 rename from releases/weekly/specs/sparc/sparc64/stage3.spec
2682 rename to releases/specs/sparc/sparc64/stage3.spec
2683 index 371f3e9f..bc2375fd 100644
2684 --- a/releases/weekly/specs/sparc/sparc64/stage3.spec
2685 +++ b/releases/specs/sparc/sparc64/stage3.spec
2686 @@ -7,5 +7,5 @@ snapshot: latest
2687 source_subpath: default/stage1-sparc64-latest
2688 compression_mode: pixz_x
2689 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2690 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2691 +portage_confdir: @REPO_DIR@/releases/portage/stages
2692 portage_prefix: releng
2693
2694 diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage1.spec b/releases/specs/sparc/sparc64/systemd-stage1.spec
2695 similarity index 86%
2696 rename from releases/weekly/specs/sparc/sparc64/systemd-stage1.spec
2697 rename to releases/specs/sparc/sparc64/systemd-stage1.spec
2698 index 7a96a8a8..bf141f8c 100644
2699 --- a/releases/weekly/specs/sparc/sparc64/systemd-stage1.spec
2700 +++ b/releases/specs/sparc/sparc64/systemd-stage1.spec
2701 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2702 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2703 update_seed: yes
2704 update_seed_command: --update --deep @world
2705 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2706 +portage_confdir: @REPO_DIR@/releases/portage/stages
2707 portage_prefix: releng
2708
2709 diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage2.spec b/releases/specs/sparc/sparc64/systemd-stage2.spec
2710 similarity index 83%
2711 rename from releases/weekly/specs/sparc/sparc64/systemd-stage2.spec
2712 rename to releases/specs/sparc/sparc64/systemd-stage2.spec
2713 index a9787ae5..98e55a41 100644
2714 --- a/releases/weekly/specs/sparc/sparc64/systemd-stage2.spec
2715 +++ b/releases/specs/sparc/sparc64/systemd-stage2.spec
2716 @@ -7,5 +7,5 @@ snapshot: latest
2717 source_subpath: default/stage1-sparc64-systemd-latest
2718 compression_mode: pixz_x
2719 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2720 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2721 +portage_confdir: @REPO_DIR@/releases/portage/stages
2722 portage_prefix: releng
2723
2724 diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage3.spec b/releases/specs/sparc/sparc64/systemd-stage3.spec
2725 similarity index 83%
2726 rename from releases/weekly/specs/sparc/sparc64/systemd-stage3.spec
2727 rename to releases/specs/sparc/sparc64/systemd-stage3.spec
2728 index 60809a18..8ac65f07 100644
2729 --- a/releases/weekly/specs/sparc/sparc64/systemd-stage3.spec
2730 +++ b/releases/specs/sparc/sparc64/systemd-stage3.spec
2731 @@ -7,5 +7,5 @@ snapshot: latest
2732 source_subpath: default/stage1-sparc64-systemd-latest
2733 compression_mode: pixz_x
2734 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2735 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2736 +portage_confdir: @REPO_DIR@/releases/portage/stages
2737 portage_prefix: releng
2738
2739 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/specs/x86/hardened/admincd-stage1.spec
2740 similarity index 98%
2741 rename from releases/weekly/specs/x86/hardened/admincd-stage1.spec
2742 rename to releases/specs/x86/hardened/admincd-stage1.spec
2743 index 048ece96..661ca1c1 100644
2744 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
2745 +++ b/releases/specs/x86/hardened/admincd-stage1.spec
2746 @@ -6,7 +6,7 @@ profile: default/linux/x86/17.0/hardened
2747 snapshot: latest
2748 source_subpath: hardened/stage3-i686-hardened-latest
2749 compression_mode: pixz_x
2750 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2751 +portage_confdir: @REPO_DIR@/releases/portage/isos
2752
2753 livecd/use:
2754 alsa
2755
2756 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/specs/x86/hardened/admincd-stage2.spec
2757 similarity index 96%
2758 rename from releases/weekly/specs/x86/hardened/admincd-stage2.spec
2759 rename to releases/specs/x86/hardened/admincd-stage2.spec
2760 index b23d8d24..836ebc14 100644
2761 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
2762 +++ b/releases/specs/x86/hardened/admincd-stage2.spec
2763 @@ -5,7 +5,7 @@ rel_type: hardened
2764 profile: default/linux/x86/17.0/hardened
2765 snapshot: latest
2766 source_subpath: hardened/livecd-stage1-i686-latest
2767 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2768 +portage_confdir: @REPO_DIR@/releases/portage/isos
2769
2770 livecd/bootargs: dokeymap
2771 livecd/fstype: squashfs
2772 @@ -16,7 +16,7 @@ livecd/volid: Gentoo x86 AdminCD latest
2773 boot/kernel: gentoo
2774
2775 boot/kernel/gentoo/sources: gentoo-sources
2776 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
2777 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/admincd-3.18.9.config
2778
2779 livecd/unmerge:
2780 app-admin/eselect
2781
2782 diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/specs/x86/hardened/installcd-stage1.spec
2783 similarity index 100%
2784 rename from releases/weekly/specs/x86/hardened/installcd-stage1.spec
2785 rename to releases/specs/x86/hardened/installcd-stage1.spec
2786
2787 diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/specs/x86/hardened/installcd-stage2-minimal.spec
2788 similarity index 98%
2789 rename from releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
2790 rename to releases/specs/x86/hardened/installcd-stage2-minimal.spec
2791 index 66dd7dbb..c3107b40 100644
2792 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
2793 +++ b/releases/specs/x86/hardened/installcd-stage2-minimal.spec
2794 @@ -16,7 +16,7 @@ livecd/volid: Gentoo x86 latest
2795 boot/kernel: gentoo
2796
2797 boot/kernel/gentoo/sources: gentoo-sources
2798 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
2799 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/hardened/installcd-2.6.38.config
2800 boot/kernel/gentoo/use:
2801 -*
2802 alsa
2803
2804 diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/specs/x86/hardened/stage1.spec
2805 similarity index 85%
2806 rename from releases/weekly/specs/x86/hardened/stage1.spec
2807 rename to releases/specs/x86/hardened/stage1.spec
2808 index 5bc5e845..4e56276a 100644
2809 --- a/releases/weekly/specs/x86/hardened/stage1.spec
2810 +++ b/releases/specs/x86/hardened/stage1.spec
2811 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2812 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2813 update_seed: yes
2814 update_seed_command: --update --deep @world
2815 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2816 +portage_confdir: @REPO_DIR@/releases/portage/stages
2817 portage_prefix: releng
2818
2819 diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/specs/x86/hardened/stage2.spec
2820 similarity index 83%
2821 rename from releases/weekly/specs/x86/hardened/stage2.spec
2822 rename to releases/specs/x86/hardened/stage2.spec
2823 index 1de92054..c294c7f0 100644
2824 --- a/releases/weekly/specs/x86/hardened/stage2.spec
2825 +++ b/releases/specs/x86/hardened/stage2.spec
2826 @@ -7,5 +7,5 @@ snapshot: latest
2827 source_subpath: hardened/stage1-i686-hardened-latest
2828 compression_mode: pixz_x
2829 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2830 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2831 +portage_confdir: @REPO_DIR@/releases/portage/stages
2832 portage_prefix: releng
2833
2834 diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/specs/x86/hardened/stage3.spec
2835 similarity index 83%
2836 rename from releases/weekly/specs/x86/hardened/stage3.spec
2837 rename to releases/specs/x86/hardened/stage3.spec
2838 index b83a849e..3d0e03cf 100644
2839 --- a/releases/weekly/specs/x86/hardened/stage3.spec
2840 +++ b/releases/specs/x86/hardened/stage3.spec
2841 @@ -7,5 +7,5 @@ snapshot: latest
2842 source_subpath: hardened/stage2-i686-hardened-latest
2843 compression_mode: pixz_x
2844 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2845 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2846 +portage_confdir: @REPO_DIR@/releases/portage/stages
2847 portage_prefix: releng
2848
2849 diff --git a/releases/weekly/specs/x86/i686/hardened/stage2.spec b/releases/specs/x86/i686/hardened/stage2.spec
2850 similarity index 100%
2851 rename from releases/weekly/specs/x86/i686/hardened/stage2.spec
2852 rename to releases/specs/x86/i686/hardened/stage2.spec
2853
2854 diff --git a/releases/weekly/specs/x86/i686/hardened/stage3.spec b/releases/specs/x86/i686/hardened/stage3.spec
2855 similarity index 100%
2856 rename from releases/weekly/specs/x86/i686/hardened/stage3.spec
2857 rename to releases/specs/x86/i686/hardened/stage3.spec
2858
2859 diff --git a/releases/weekly/specs/x86/i686/livecd-stage1.spec b/releases/specs/x86/i686/livecd-stage1.spec
2860 similarity index 100%
2861 rename from releases/weekly/specs/x86/i686/livecd-stage1.spec
2862 rename to releases/specs/x86/i686/livecd-stage1.spec
2863
2864 diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/specs/x86/i686/livecd-stage2.spec
2865 similarity index 100%
2866 rename from releases/weekly/specs/x86/i686/livecd-stage2.spec
2867 rename to releases/specs/x86/i686/livecd-stage2.spec
2868
2869 diff --git a/releases/weekly/specs/x86/i686/livedvd-stage1.spec b/releases/specs/x86/i686/livedvd-stage1.spec
2870 similarity index 100%
2871 rename from releases/weekly/specs/x86/i686/livedvd-stage1.spec
2872 rename to releases/specs/x86/i686/livedvd-stage1.spec
2873
2874 diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/specs/x86/i686/livedvd-stage2.spec
2875 similarity index 100%
2876 rename from releases/weekly/specs/x86/i686/livedvd-stage2.spec
2877 rename to releases/specs/x86/i686/livedvd-stage2.spec
2878
2879 diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/specs/x86/i686/stage1.spec
2880 similarity index 84%
2881 rename from releases/weekly/specs/x86/i686/stage1.spec
2882 rename to releases/specs/x86/i686/stage1.spec
2883 index cde76481..355a0c17 100644
2884 --- a/releases/weekly/specs/x86/i686/stage1.spec
2885 +++ b/releases/specs/x86/i686/stage1.spec
2886 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2887 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2888 update_seed: yes
2889 update_seed_command: --update --deep @world
2890 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2891 +portage_confdir: @REPO_DIR@/releases/portage/stages
2892 portage_prefix: releng
2893
2894 diff --git a/releases/weekly/specs/x86/i686/stage2-desktop.spec b/releases/specs/x86/i686/stage2-desktop.spec
2895 similarity index 100%
2896 rename from releases/weekly/specs/x86/i686/stage2-desktop.spec
2897 rename to releases/specs/x86/i686/stage2-desktop.spec
2898
2899 diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/specs/x86/i686/stage2.spec
2900 similarity index 81%
2901 rename from releases/weekly/specs/x86/i686/stage2.spec
2902 rename to releases/specs/x86/i686/stage2.spec
2903 index 5fe221cf..edec3493 100644
2904 --- a/releases/weekly/specs/x86/i686/stage2.spec
2905 +++ b/releases/specs/x86/i686/stage2.spec
2906 @@ -7,5 +7,5 @@ snapshot: latest
2907 source_subpath: default/stage1-i686-latest
2908 compression_mode: pixz_x
2909 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2910 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2911 +portage_confdir: @REPO_DIR@/releases/portage/stages
2912 portage_prefix: releng
2913
2914 diff --git a/releases/weekly/specs/x86/i686/stage3-desktop.spec b/releases/specs/x86/i686/stage3-desktop.spec
2915 similarity index 100%
2916 rename from releases/weekly/specs/x86/i686/stage3-desktop.spec
2917 rename to releases/specs/x86/i686/stage3-desktop.spec
2918
2919 diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/specs/x86/i686/stage3.spec
2920 similarity index 81%
2921 rename from releases/weekly/specs/x86/i686/stage3.spec
2922 rename to releases/specs/x86/i686/stage3.spec
2923 index eb536dfa..58c55ff2 100644
2924 --- a/releases/weekly/specs/x86/i686/stage3.spec
2925 +++ b/releases/specs/x86/i686/stage3.spec
2926 @@ -7,5 +7,5 @@ snapshot: latest
2927 source_subpath: default/stage2-i686-latest
2928 compression_mode: pixz_x
2929 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2930 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2931 +portage_confdir: @REPO_DIR@/releases/portage/stages
2932 portage_prefix: releng
2933
2934 diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/specs/x86/installcd-stage1.spec
2935 similarity index 96%
2936 rename from releases/weekly/specs/x86/installcd-stage1.spec
2937 rename to releases/specs/x86/installcd-stage1.spec
2938 index de8fdf98..3cfeba20 100644
2939 --- a/releases/weekly/specs/x86/installcd-stage1.spec
2940 +++ b/releases/specs/x86/installcd-stage1.spec
2941 @@ -6,7 +6,7 @@ profile: default/linux/x86/17.0
2942 snapshot: latest
2943 source_subpath: default/stage3-i486-latest
2944 compression_mode: pixz_x
2945 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2946 +portage_confdir: @REPO_DIR@/releases/portage/isos
2947
2948 livecd/use:
2949 alsa
2950
2951 diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/specs/x86/installcd-stage2-minimal.spec
2952 similarity index 96%
2953 rename from releases/weekly/specs/x86/installcd-stage2-minimal.spec
2954 rename to releases/specs/x86/installcd-stage2-minimal.spec
2955 index e5afaf13..bb171e33 100644
2956 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
2957 +++ b/releases/specs/x86/installcd-stage2-minimal.spec
2958 @@ -5,7 +5,7 @@ rel_type: default
2959 profile: default/linux/x86/17.0
2960 snapshot: latest
2961 source_subpath: default/livecd-stage1-i486-latest
2962 -portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
2963 +portage_confdir: @REPO_DIR@/releases/portage/isos
2964
2965 livecd/bootargs: dokeymap
2966 #livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
2967 @@ -17,7 +17,7 @@ livecd/volid: Gentoo x86 latest
2968 boot/kernel: gentoo
2969
2970 boot/kernel/gentoo/sources: gentoo-sources
2971 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/installcd-4.14.52.config
2972 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/installcd-4.14.52.config
2973
2974 livecd/unmerge:
2975 app-admin/eselect
2976
2977 diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/specs/x86/stage1.spec
2978 similarity index 84%
2979 rename from releases/weekly/specs/x86/stage1.spec
2980 rename to releases/specs/x86/stage1.spec
2981 index 22289aeb..be0bb437 100644
2982 --- a/releases/weekly/specs/x86/stage1.spec
2983 +++ b/releases/specs/x86/stage1.spec
2984 @@ -9,5 +9,5 @@ compression_mode: pixz_x
2985 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
2986 update_seed: yes
2987 update_seed_command: --update --deep @world
2988 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
2989 +portage_confdir: @REPO_DIR@/releases/portage/stages
2990 portage_prefix: releng
2991
2992 diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/specs/x86/stage2.spec
2993 similarity index 81%
2994 rename from releases/weekly/specs/x86/stage2.spec
2995 rename to releases/specs/x86/stage2.spec
2996 index 2cef628b..6c060867 100644
2997 --- a/releases/weekly/specs/x86/stage2.spec
2998 +++ b/releases/specs/x86/stage2.spec
2999 @@ -7,5 +7,5 @@ snapshot: latest
3000 source_subpath: default/stage1-i486-latest
3001 compression_mode: pixz_x
3002 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
3003 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
3004 +portage_confdir: @REPO_DIR@/releases/portage/stages
3005 portage_prefix: releng
3006
3007 diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/specs/x86/stage3.spec
3008 similarity index 81%
3009 rename from releases/weekly/specs/x86/stage3.spec
3010 rename to releases/specs/x86/stage3.spec
3011 index 6f40346a..046f6543 100644
3012 --- a/releases/weekly/specs/x86/stage3.spec
3013 +++ b/releases/specs/x86/stage3.spec
3014 @@ -7,5 +7,5 @@ snapshot: latest
3015 source_subpath: default/stage2-i486-latest
3016 compression_mode: pixz_x
3017 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
3018 -portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
3019 +portage_confdir: @REPO_DIR@/releases/portage/stages
3020 portage_prefix: releng
3021
3022 diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
3023 index 8d1bf8ea..8d54a3a0 100644
3024 --- a/tools-musl/stage4-hardened-amd64.spec
3025 +++ b/tools-musl/stage4-hardened-amd64.spec
3026 @@ -43,7 +43,7 @@ stage4/rcadd:
3027
3028 boot/kernel: gentoo
3029 boot/kernel/gentoo/sources: gentoo-sources
3030 -boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
3031 +boot/kernel/gentoo/config: @REPO_DIR@/../releases/kconfig/amd64/cloud-amd64-gentoo.config
3032 boot/kernel/gentoo/extraversion: openstack
3033 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --no-nfs --makeopts=-j4
3034
3035
3036 diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
3037 index 1ca4f029..6548d5a8 100644
3038 --- a/tools-systemd/stage4-amd64.spec
3039 +++ b/tools-systemd/stage4-amd64.spec
3040 @@ -29,7 +29,7 @@ stage4/packages:
3041 sys-devel/bc
3042 sys-power/acpid
3043 app-crypt/gentoo-keys
3044 -stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
3045 +stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
3046 stage4/rcadd:
3047 acpid|default
3048 net.lo|default
3049 @@ -38,7 +38,7 @@ stage4/rcadd:
3050
3051 boot/kernel: gentoo
3052 boot/kernel/gentoo/sources: gentoo-sources
3053 -boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
3054 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
3055 boot/kernel/gentoo/extraversion: openstack
3056 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
3057
3058
3059 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
3060 index c8090e97..27825851 100644
3061 --- a/tools/catalyst-auto-alpha.conf
3062 +++ b/tools/catalyst-auto-alpha.conf
3063 @@ -1,7 +1,7 @@
3064 # This is the config file for the catalyst-auto script. It should be pretty
3065 # self-explanatory.
3066
3067 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/alpha
3068 +SPECS_DIR=${REPO_DIR}/releases/specs/alpha
3069
3070 SPECS="stage1.spec stage3.spec"
3071 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
3072 @@ -16,7 +16,7 @@ SETS="default"
3073 SET_default_SPECS="stage1.spec stage3.spec"
3074 SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3075
3076 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/alpha
3077 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
3078
3079 update_symlinks() {
3080 # Symlink the latest stages3 to build from
3081
3082 diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
3083 index 5e444764..b78f3d23 100644
3084 --- a/tools/catalyst-auto-amd64-experimental.conf
3085 +++ b/tools/catalyst-auto-amd64-experimental.conf
3086 @@ -7,7 +7,7 @@ host=$(hostname)
3087
3088 source /etc/catalyst/release/build.env
3089
3090 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
3091 +SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
3092
3093 SETS="
3094 multilib minimal_multilib
3095 @@ -36,7 +36,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
3096 SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
3097 SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
3098
3099 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
3100 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
3101
3102 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
3103
3104
3105 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
3106 index 31cb48b0..57f080aa 100644
3107 --- a/tools/catalyst-auto-amd64.conf
3108 +++ b/tools/catalyst-auto-amd64.conf
3109 @@ -7,7 +7,7 @@ host=$(hostname)
3110
3111 source /etc/catalyst/release/build.env
3112
3113 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
3114 +SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
3115
3116 SETS="
3117 multilib minimal_multilib
3118 @@ -37,7 +37,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
3119 #SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
3120 SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
3121
3122 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
3123 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
3124
3125 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
3126
3127
3128 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
3129 index 15a4a0c4..774dc265 100644
3130 --- a/tools/catalyst-auto-arm64.conf
3131 +++ b/tools/catalyst-auto-arm64.conf
3132 @@ -3,7 +3,7 @@
3133
3134 REPO_DIR=/root/releng/
3135
3136 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm64
3137 +SPECS_DIR=${REPO_DIR}/releases/specs/arm64
3138 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3139
3140 SETS="default"
3141 @@ -11,7 +11,7 @@ SETS="default"
3142 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3143 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3144
3145 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3146 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3147
3148 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3149
3150
3151 diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
3152 index 0727b830..e09b6cb8 100644
3153 --- a/tools/catalyst-auto-armv4tl.conf
3154 +++ b/tools/catalyst-auto-armv4tl.conf
3155 @@ -3,7 +3,7 @@
3156
3157 REPO_DIR=/root/releng/
3158
3159 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv4tl
3160 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv4tl
3161 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3162
3163 SETS="default"
3164 @@ -11,7 +11,7 @@ SETS="default"
3165 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3166 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3167
3168 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3169 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3170
3171 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3172
3173
3174 diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
3175 index 9956a033..8daef964 100644
3176 --- a/tools/catalyst-auto-armv5tel.conf
3177 +++ b/tools/catalyst-auto-armv5tel.conf
3178 @@ -3,7 +3,7 @@
3179
3180 REPO_DIR=/root/releng/
3181
3182 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv5tel
3183 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv5tel
3184 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3185
3186 SETS="default"
3187 @@ -11,7 +11,7 @@ SETS="default"
3188 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3189 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3190
3191 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3192 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3193
3194 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3195
3196
3197 diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
3198 index 97406f65..a1d52f5d 100644
3199 --- a/tools/catalyst-auto-armv6j.conf
3200 +++ b/tools/catalyst-auto-armv6j.conf
3201 @@ -3,7 +3,7 @@
3202
3203 REPO_DIR=/root/releng/
3204
3205 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv6j
3206 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j
3207 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3208
3209 SETS="default"
3210 @@ -11,7 +11,7 @@ SETS="default"
3211 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3212 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3213
3214 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3215 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3216
3217 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3218
3219
3220 diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
3221 index 6f26e2fa..50bf09f7 100644
3222 --- a/tools/catalyst-auto-armv6j_hardfp.conf
3223 +++ b/tools/catalyst-auto-armv6j_hardfp.conf
3224 @@ -3,7 +3,7 @@
3225
3226 REPO_DIR=/root/releng/
3227
3228 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv6j/hardfloat
3229 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j/hardfloat
3230 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3231
3232 SETS="default"
3233 @@ -11,7 +11,7 @@ SETS="default"
3234 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3235 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3236
3237 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3238 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3239
3240 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3241
3242
3243 diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
3244 index 0e7a6126..a4def3c7 100644
3245 --- a/tools/catalyst-auto-armv7a.conf
3246 +++ b/tools/catalyst-auto-armv7a.conf
3247 @@ -3,7 +3,7 @@
3248
3249 REPO_DIR=/root/releng/
3250
3251 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv7a
3252 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a
3253 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3254
3255 SETS="default"
3256 @@ -11,7 +11,7 @@ SETS="default"
3257 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3258 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3259
3260 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3261 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3262
3263 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3264
3265
3266 diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
3267 index e9c893d2..ce7904a5 100644
3268 --- a/tools/catalyst-auto-armv7a_hardfp.conf
3269 +++ b/tools/catalyst-auto-armv7a_hardfp.conf
3270 @@ -3,7 +3,7 @@
3271
3272 REPO_DIR=/root/releng/
3273
3274 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv7a/hardfloat
3275 +SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a/hardfloat
3276 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3277
3278 SETS="default"
3279 @@ -11,7 +11,7 @@ SETS="default"
3280 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
3281 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3282
3283 -#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3284 +#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3285
3286 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
3287
3288
3289 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
3290 index 850cf411..967985b6 100644
3291 --- a/tools/catalyst-auto-hppa.conf
3292 +++ b/tools/catalyst-auto-hppa.conf
3293 @@ -1,7 +1,7 @@
3294 # This is the config file for the catalyst-auto script. It should be pretty
3295 # self-explanatory.
3296
3297 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/hppa
3298 +SPECS_DIR=${REPO_DIR}/releases/specs/hppa
3299
3300 SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
3301
3302 @@ -13,7 +13,7 @@ SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3303
3304 SET_hppa_netboot_SPECS="netboot2-hppa32.spec netboot2-hppa64.spec"
3305
3306 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/hppa
3307 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
3308
3309 EMAIL_SUBJECT_PREPEND="[hppa-auto]"
3310
3311
3312 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
3313 index e441cfc8..0bc6e0af 100644
3314 --- a/tools/catalyst-auto-ia64.conf
3315 +++ b/tools/catalyst-auto-ia64.conf
3316 @@ -1,7 +1,7 @@
3317 # This is the config file for the catalyst-auto script. It should be pretty
3318 # self-explanatory.
3319
3320 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ia64
3321 +SPECS_DIR=${REPO_DIR}/releases/specs/ia64
3322
3323 SPECS="stage1.spec stage3.spec"
3324 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
3325 @@ -10,7 +10,7 @@ SPECS="stage1.spec stage3.spec"
3326
3327 OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3328
3329 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/ia64
3330 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
3331
3332 update_symlinks() {
3333 # Symlink the latest stages3 to build from
3334
3335 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
3336 index 1ff04bd0..4935739a 100644
3337 --- a/tools/catalyst-auto-ppc.conf
3338 +++ b/tools/catalyst-auto-ppc.conf
3339 @@ -1,7 +1,7 @@
3340 # This is the config file for the catalyst-auto script. It should be pretty
3341 # self-explanatory.
3342
3343 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc
3344 +SPECS_DIR=${REPO_DIR}/releases/specs/ppc
3345
3346 SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
3347 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
3348 @@ -10,7 +10,7 @@ SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
3349
3350 OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
3351
3352 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
3353 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
3354
3355 EMAIL_SUBJECT_PREPEND="[ppc-auto]"
3356
3357
3358 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
3359 index acfcdfec..bb6e2852 100644
3360 --- a/tools/catalyst-auto-ppc64le.conf
3361 +++ b/tools/catalyst-auto-ppc64le.conf
3362 @@ -1,7 +1,7 @@
3363 # This is the config file for the catalyst-auto script. It should be pretty
3364 # self-explanatory.
3365
3366 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64le
3367 +SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
3368
3369 SPECS="stage1.spec stage3.spec"
3370
3371 @@ -11,7 +11,7 @@ SPECS="stage1.spec stage3.spec"
3372
3373 #OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
3374
3375 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
3376 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
3377
3378 EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
3379
3380
3381 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
3382 index 4986c053..ed84923a 100644
3383 --- a/tools/catalyst-auto-s390.conf
3384 +++ b/tools/catalyst-auto-s390.conf
3385 @@ -1,7 +1,7 @@
3386 # This is the config file for the catalyst-auto script. It should be pretty
3387 # self-explanatory.
3388
3389 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/s390/s390
3390 +SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
3391 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3392
3393 SETS="default netboot"
3394 @@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage3.spec"
3395
3396 SET_netboot_SPECS="netboot/netboot.spec"
3397
3398 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
3399 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
3400
3401 update_symlinks() {
3402 # Symlink the latest stages3 to build from
3403
3404 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
3405 index ab10f702..8bdb8993 100644
3406 --- a/tools/catalyst-auto-s390x.conf
3407 +++ b/tools/catalyst-auto-s390x.conf
3408 @@ -1,7 +1,7 @@
3409 # This is the config file for the catalyst-auto script. It should be pretty
3410 # self-explanatory.
3411
3412 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/s390/s390x
3413 +SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
3414 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
3415
3416 SETS="default netboot"
3417 @@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage3.spec"
3418
3419 SET_netboot_SPECS="netboot/netboot.spec"
3420
3421 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
3422 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
3423
3424 update_symlinks() {
3425 # Symlink the latest stages3 to build from
3426
3427 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
3428 index 5e83a6bc..94723124 100644
3429 --- a/tools/catalyst-auto-sparc64.conf
3430 +++ b/tools/catalyst-auto-sparc64.conf
3431 @@ -1,12 +1,12 @@
3432 # This is the config file for the catalyst-auto script. It should be pretty
3433 # self-explanatory.
3434
3435 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc
3436 +SPECS_DIR=${REPO_DIR}/releases/specs/sparc
3437
3438 SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
3439 OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
3440
3441 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
3442 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
3443
3444 EMAIL_SUBJECT_PREPEND="[sparc-auto]"
3445
3446
3447 diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
3448 index 673e00e9..da8c3df6 100644
3449 --- a/tools/catalyst-auto-x86-experimental.conf
3450 +++ b/tools/catalyst-auto-x86-experimental.conf
3451 @@ -7,7 +7,7 @@ host=$(hostname)
3452
3453 source /etc/catalyst/release/build.env
3454
3455 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
3456 +SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
3457
3458 SETS="
3459 i486
3460 @@ -23,7 +23,7 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
3461 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
3462 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
3463
3464 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
3465 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
3466
3467 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
3468
3469
3470 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
3471 index 0aa7990a..6d8ea027 100644
3472 --- a/tools/catalyst-auto-x86.conf
3473 +++ b/tools/catalyst-auto-x86.conf
3474 @@ -7,7 +7,7 @@ host=$(hostname)
3475
3476 source /etc/catalyst/release/build.env
3477
3478 -SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
3479 +SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
3480
3481 SETS="
3482 i486
3483 @@ -23,7 +23,7 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
3484 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
3485 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
3486
3487 -KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
3488 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
3489
3490 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"