[gentoo-commits] proj/releng:master commit in: releases/overlays/common/overlay/livecd/snapshots/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/releng:master commit in: releases/overlays/common/overlay/livecd/snapshots/, ...
@ 2020-04-29 23:20 Matt Turner
  0 siblings, 0 replies; only message in thread
From: Matt Turner @ 2020-04-29 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8407af57f5aa9c95c0e6e6ae726361b3c578627d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 01:16:29 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 01:18:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=8407af57

Remove weekly directory

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 releases/{weekly => }/kconfig/alpha/installcd-4.14.83.config        | 0
 releases/{weekly => }/kconfig/alpha/installcd-4.14.83.nolsa.config  | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.11.7.config           | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.14.5-r2.config        | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.15.8.config           | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.18.9.config           | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.8.3-selinux.config    | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.8.3.config            | 0
 releases/{weekly => }/kconfig/amd64/admincd-3.9.5.config            | 0
 releases/{weekly => }/kconfig/amd64/admincd-4.14.83.config          | 0
 releases/{weekly => }/kconfig/amd64/admincd-4.4.8-r1-selinux.config | 0
 releases/{weekly => }/kconfig/amd64/admincd-4.4.8-r1.config         | 0
 releases/{weekly => }/kconfig/amd64/cloud-amd64-gentoo.config       | 0
 releases/{weekly => }/kconfig/amd64/cloud-amd64-hardened.config     | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.10.17.config        | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.12.21.config        | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.16.5.config         | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.18.12.config        | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.7.4.config          | 0
 releases/{weekly => }/kconfig/amd64/installcd-3.8.13.config         | 0
 releases/{weekly => }/kconfig/amd64/installcd-4.14.52.config        | 0
 releases/{weekly => }/kconfig/amd64/installcd-4.4.6.config          | 0
 releases/{weekly => }/kconfig/amd64/livecd-2.6.24.config            | 0
 releases/{weekly => }/kconfig/arm64/packet-arm64.config             | 0
 releases/{weekly => }/kconfig/hppa/installcd-2.6.24-livecd32.config | 0
 releases/{weekly => }/kconfig/hppa/installcd-2.6.24-livecd64.config | 0
 .../kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config            | 0
 .../kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config            | 0
 .../kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config             | 0
 .../kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config             | 0
 releases/{weekly => }/kconfig/ia64/installcd-3.8.13.config          | 0
 releases/{weekly => }/kconfig/powerpc/installcd-ibm-4.19.config     | 0
 .../{weekly => }/kconfig/powerpc/installcd-ppc32apple-4.19.config   | 0
 .../{weekly => }/kconfig/powerpc/installcd-ppc64apple-4.19.config   | 0
 releases/{weekly => }/kconfig/s390/netboot64.config                 | 0
 releases/{weekly => }/kconfig/sparc/installcd-3.8.13.config         | 0
 releases/{weekly => }/kconfig/sparc/installcd-4.14.39.config        | 0
 releases/{weekly => }/kconfig/sparc/installcd-4.14.83.config        | 0
 releases/{weekly => }/kconfig/sparc/installcd-4.19.44.config        | 0
 releases/{weekly => }/kconfig/x86/admincd-3.0.config                | 0
 releases/{weekly => }/kconfig/x86/admincd-3.18.9.config             | 0
 releases/{weekly => }/kconfig/x86/admincd-3.2.config                | 0
 releases/{weekly => }/kconfig/x86/admincd-3.4.2.config              | 0
 releases/{weekly => }/kconfig/x86/admincd-3.9.5.config              | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.24.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.27.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.28.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.31.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.37.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-2.6.38.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-3.18.12.config          | 0
 releases/{weekly => }/kconfig/x86/installcd-3.4.2.config            | 0
 releases/{weekly => }/kconfig/x86/installcd-3.8.13.config           | 0
 releases/{weekly => }/kconfig/x86/installcd-4.14.52.config          | 0
 releases/{weekly => }/kconfig/x86/livecd-2.6.24.config              | 0
 .../{weekly => }/overlays/common/overlay/installcd/distfiles/README | 0
 releases/{weekly => }/overlays/common/overlay/installcd/docs/README | 0
 .../{weekly => }/overlays/common/overlay/installcd/snapshots/README | 0
 .../{weekly => }/overlays/common/overlay/installcd/stages/README    | 0
 releases/{weekly => }/overlays/common/overlay/livecd/docs/README    | 0
 .../{weekly => }/overlays/common/overlay/livecd/snapshots/README    | 0
 .../{weekly => }/overlays/common/overlay/livedvd/distfiles/README   | 0
 releases/{weekly => }/overlays/common/overlay/livedvd/docs/README   | 0
 .../{weekly => }/overlays/common/overlay/livedvd/snapshots/README   | 0
 releases/{weekly => }/overlays/common/overlay/livedvd/stages/README | 0
 .../.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml   | 0
 .../overlays/common/root_overlay/home/gentoo/.xscreensaver          | 0
 .../portage/isos/package.accept_keywords/admincd-packages           | 0
 releases/{weekly => }/portage/isos/package.accept_keywords/zfs      | 0
 releases/{weekly => }/portage/isos/package.license/package.license  | 0
 releases/{weekly => }/portage/isos/package.use/admincd-packages     | 0
 releases/{weekly => }/portage/isos/package.use/cifs-utils           | 0
 releases/{weekly => }/portage/isos/package.use/genkernel            | 0
 releases/{weekly => }/portage/isos/package.use/linux-firmware       | 0
 .../{weekly => }/portage/isos/savedconfig/sys-kernel/linux-firmware | 0
 releases/{weekly => }/portage/stages/package.use/releng/libpcre     | 0
 releases/{weekly => }/portage/stages/package.use/releng/no-filecaps | 0
 releases/{weekly => }/scripts/cloud-prep.sh                         | 0
 releases/{weekly => }/scripts/livecd.sh                             | 0
 releases/{weekly => }/specs/alpha/installcd-stage1.spec             | 2 +-
 releases/{weekly => }/specs/alpha/installcd-stage2-minimal.spec     | 4 ++--
 releases/{weekly => }/specs/alpha/netboot/bs.conf                   | 0
 releases/{weekly => }/specs/alpha/netboot/cmd                       | 0
 releases/{weekly => }/specs/alpha/netboot/config                    | 0
 releases/{weekly => }/specs/alpha/netboot/netboot2.spec             | 0
 releases/{weekly => }/specs/alpha/stage1.spec                       | 2 +-
 releases/{weekly => }/specs/alpha/stage2.spec                       | 2 +-
 releases/{weekly => }/specs/alpha/stage3.spec                       | 2 +-
 .../{weekly => }/specs/amd64/hardened/admincd-stage1-selinux.spec   | 2 +-
 releases/{weekly => }/specs/amd64/hardened/admincd-stage1.spec      | 2 +-
 .../{weekly => }/specs/amd64/hardened/admincd-stage2-selinux.spec   | 4 ++--
 releases/{weekly => }/specs/amd64/hardened/admincd-stage2.spec      | 4 ++--
 releases/{weekly => }/specs/amd64/hardened/stage1-nomultilib.spec   | 2 +-
 .../specs/amd64/hardened/stage1-selinux-nomultilib.spec             | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage1-selinux.spec      | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage1.spec              | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage2-nomultilib.spec   | 2 +-
 .../specs/amd64/hardened/stage2-selinux-nomultilib.spec             | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage2-selinux.spec      | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage2.spec              | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage3-nomultilib.spec   | 2 +-
 .../specs/amd64/hardened/stage3-selinux-nomultilib.spec             | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage3-selinux.spec      | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage3.spec              | 2 +-
 releases/{weekly => }/specs/amd64/hardened/stage4-minimal.spec      | 6 +++---
 .../specs/amd64/hardened/stage4-nomultilib-minimal.spec             | 6 +++---
 releases/{weekly => }/specs/amd64/installcd-stage1.spec             | 2 +-
 releases/{weekly => }/specs/amd64/installcd-stage2-minimal.spec     | 4 ++--
 releases/{weekly => }/specs/amd64/livecd-stage1.spec                | 0
 releases/{weekly => }/specs/amd64/livecd-stage2.spec                | 0
 releases/{weekly => }/specs/amd64/livedvd-stage1.spec               | 0
 releases/{weekly => }/specs/amd64/livedvd-stage2.spec               | 0
 releases/{weekly => }/specs/amd64/stage1-nomultilib.spec            | 2 +-
 releases/{weekly => }/specs/amd64/stage1-x32.spec                   | 2 +-
 releases/{weekly => }/specs/amd64/stage1.spec                       | 2 +-
 releases/{weekly => }/specs/amd64/stage2-desktop.spec               | 0
 releases/{weekly => }/specs/amd64/stage2-nomultilib.spec            | 2 +-
 releases/{weekly => }/specs/amd64/stage2-x32.spec                   | 2 +-
 releases/{weekly => }/specs/amd64/stage2.spec                       | 2 +-
 releases/{weekly => }/specs/amd64/stage3-desktop.spec               | 0
 releases/{weekly => }/specs/amd64/stage3-nomultilib.spec            | 2 +-
 releases/{weekly => }/specs/amd64/stage3-x32.spec                   | 2 +-
 releases/{weekly => }/specs/amd64/stage3.spec                       | 2 +-
 releases/{weekly => }/specs/amd64/stage4-minimal.spec               | 6 +++---
 releases/{weekly => }/specs/amd64/stage4-nomultilib-minimal.spec    | 6 +++---
 releases/{weekly => }/specs/arm/armeb/stage1.spec                   | 0
 releases/{weekly => }/specs/arm/armeb/stage2.spec                   | 0
 releases/{weekly => }/specs/arm/armeb/stage3.spec                   | 0
 releases/{weekly => }/specs/arm/armv4l/stage1.spec                  | 0
 releases/{weekly => }/specs/arm/armv4l/stage2.spec                  | 0
 releases/{weekly => }/specs/arm/armv4l/stage3.spec                  | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm/stage1.spec        | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm/stage2.spec        | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm/stage3.spec        | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage1.spec     | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage2.spec     | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm110/stage3.spec     | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage1.spec    | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage2.spec    | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1100/stage3.spec    | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage1.spec    | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage2.spec    | 0
 releases/{weekly => }/specs/arm/armv4l/strongarm1110/stage3.spec    | 0
 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage1.spec        | 0
 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage2.spec        | 0
 releases/{weekly => }/specs/arm/armv4tl/openmoko/stage3.spec        | 0
 releases/{weekly => }/specs/arm/armv4tl/stage1.spec                 | 0
 releases/{weekly => }/specs/arm/armv4tl/stage2.spec                 | 0
 releases/{weekly => }/specs/arm/armv4tl/stage3.spec                 | 0
 releases/{weekly => }/specs/arm/armv5teb/stage1.spec                | 0
 releases/{weekly => }/specs/arm/armv5teb/stage2.spec                | 0
 releases/{weekly => }/specs/arm/armv5teb/stage3.spec                | 0
 releases/{weekly => }/specs/arm/armv5tejl/stage1.spec               | 0
 releases/{weekly => }/specs/arm/armv5tejl/stage2.spec               | 0
 releases/{weekly => }/specs/arm/armv5tejl/stage3.spec               | 0
 releases/{weekly => }/specs/arm/armv5tel/stage1.spec                | 0
 releases/{weekly => }/specs/arm/armv5tel/stage2.spec                | 0
 releases/{weekly => }/specs/arm/armv5tel/stage3.spec                | 0
 releases/{weekly => }/specs/arm/armv5tl/stage1.spec                 | 0
 releases/{weekly => }/specs/arm/armv5tl/stage2.spec                 | 0
 releases/{weekly => }/specs/arm/armv5tl/stage3.spec                 | 0
 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage1.spec        | 0
 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage2.spec        | 0
 releases/{weekly => }/specs/arm/armv6j/hardfloat/stage3.spec        | 0
 releases/{weekly => }/specs/arm/armv6j/stage1.spec                  | 0
 releases/{weekly => }/specs/arm/armv6j/stage2.spec                  | 0
 releases/{weekly => }/specs/arm/armv6j/stage3.spec                  | 0
 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage1.spec        | 0
 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage2.spec        | 0
 releases/{weekly => }/specs/arm/armv7a/hardfloat/stage3.spec        | 0
 releases/{weekly => }/specs/arm/armv7a/stage1.spec                  | 0
 releases/{weekly => }/specs/arm/armv7a/stage2.spec                  | 0
 releases/{weekly => }/specs/arm/armv7a/stage3.spec                  | 0
 releases/{weekly => }/specs/arm/stage1.spec                         | 0
 releases/{weekly => }/specs/arm/stage2.spec                         | 0
 releases/{weekly => }/specs/arm/stage3.spec                         | 0
 releases/{weekly => }/specs/arm64/stage1.spec                       | 2 +-
 releases/{weekly => }/specs/arm64/stage2.spec                       | 2 +-
 releases/{weekly => }/specs/arm64/stage3.spec                       | 2 +-
 releases/{weekly => }/specs/arm64/stage4-minimal.spec               | 6 +++---
 releases/{weekly => }/specs/hppa/hppa1.1/stage1.spec                | 2 +-
 releases/{weekly => }/specs/hppa/hppa1.1/stage2.spec                | 2 +-
 releases/{weekly => }/specs/hppa/hppa1.1/stage3.spec                | 2 +-
 releases/{weekly => }/specs/hppa/hppa2.0/stage1.spec                | 2 +-
 releases/{weekly => }/specs/hppa/hppa2.0/stage2.spec                | 2 +-
 releases/{weekly => }/specs/hppa/hppa2.0/stage3.spec                | 2 +-
 releases/{weekly => }/specs/hppa/installcd-stage1.spec              | 2 +-
 releases/{weekly => }/specs/hppa/installcd-stage2-minimal.spec      | 2 +-
 releases/{weekly => }/specs/hppa/installcd-stage2-universal.spec    | 0
 releases/{weekly => }/specs/hppa/netboot2-hppa32.spec               | 2 +-
 releases/{weekly => }/specs/hppa/netboot2-hppa64.spec               | 2 +-
 releases/{weekly => }/specs/ia64/installcd-stage1.spec              | 2 +-
 releases/{weekly => }/specs/ia64/installcd-stage2-minimal.spec      | 2 +-
 releases/{weekly => }/specs/ia64/stage1.spec                        | 2 +-
 releases/{weekly => }/specs/ia64/stage2.spec                        | 2 +-
 releases/{weekly => }/specs/ia64/stage3.spec                        | 2 +-
 releases/{weekly => }/specs/mips/mips3/netboot.spec                 | 0
 releases/{weekly => }/specs/mips/mips3/stage1.spec                  | 0
 releases/{weekly => }/specs/mips/mips3/stage2.spec                  | 0
 releases/{weekly => }/specs/mips/mips3/stage3.spec                  | 0
 releases/{weekly => }/specs/mips/mips4/stage1.spec                  | 0
 releases/{weekly => }/specs/mips/mips4/stage2.spec                  | 0
 releases/{weekly => }/specs/mips/mips4/stage3.spec                  | 0
 releases/{weekly => }/specs/ppc/ppc32/g4/stage2.spec                | 0
 releases/{weekly => }/specs/ppc/ppc32/g4/stage3.spec                | 0
 releases/{weekly => }/specs/ppc/ppc32/installcd-stage1.spec         | 2 +-
 releases/{weekly => }/specs/ppc/ppc32/installcd-stage2-minimal.spec | 2 +-
 releases/{weekly => }/specs/ppc/ppc32/stage1.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc32/stage2.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc32/stage3.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage1.spec   | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage2.spec   | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/hardened/stage3.spec   | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage1.spec  | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage2.spec  | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/softfloat/stage3.spec  | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage1.spec            | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage2.spec            | 0
 releases/{weekly => }/specs/ppc/ppc32/uclibc/stage3.spec            | 0
 releases/{weekly => }/specs/ppc/ppc64/stage1-32ul.spec              | 2 +-
 releases/{weekly => }/specs/ppc/ppc64/stage1.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc64/stage2-32ul.spec              | 2 +-
 releases/{weekly => }/specs/ppc/ppc64/stage2.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc64/stage3-32ul.spec              | 2 +-
 releases/{weekly => }/specs/ppc/ppc64/stage3.spec                   | 2 +-
 releases/{weekly => }/specs/ppc/ppc64le/stage1.spec                 | 2 +-
 releases/{weekly => }/specs/ppc/ppc64le/stage3.spec                 | 2 +-
 releases/{weekly => }/specs/s390/s390/netboot/misc/gentoo.exec      | 0
 releases/{weekly => }/specs/s390/s390/netboot/misc/gentoo.parmfile  | 0
 releases/{weekly => }/specs/s390/s390/netboot/netboot.spec          | 2 +-
 .../s390/netboot/portage/package.accept_keywords/gentoo-sources     | 0
 .../specs/s390/s390/netboot/portage/package.use/genkernel           | 0
 .../s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch    | 0
 releases/{weekly => }/specs/s390/s390/stage1.spec                   | 2 +-
 releases/{weekly => }/specs/s390/s390/stage2.spec                   | 2 +-
 releases/{weekly => }/specs/s390/s390/stage3.spec                   | 2 +-
 releases/{weekly => }/specs/s390/s390x/netboot/misc/gentoo.exec     | 0
 releases/{weekly => }/specs/s390/s390x/netboot/misc/gentoo.parmfile | 0
 releases/{weekly => }/specs/s390/s390x/netboot/netboot.spec         | 2 +-
 .../s390x/netboot/portage/package.accept_keywords/gentoo-sources    | 0
 .../specs/s390/s390x/netboot/portage/package.use/genkernel          | 0
 .../s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch   | 0
 releases/{weekly => }/specs/s390/s390x/stage1.spec                  | 2 +-
 releases/{weekly => }/specs/s390/s390x/stage2.spec                  | 2 +-
 releases/{weekly => }/specs/s390/s390x/stage3.spec                  | 2 +-
 releases/{weekly => }/specs/sh/sh4/stage1.spec                      | 0
 releases/{weekly => }/specs/sh/sh4/stage2.spec                      | 0
 releases/{weekly => }/specs/sh/sh4/stage3.spec                      | 0
 releases/{weekly => }/specs/sh/sh4a/stage1.spec                     | 0
 releases/{weekly => }/specs/sh/sh4a/stage2.spec                     | 0
 releases/{weekly => }/specs/sh/sh4a/stage3.spec                     | 0
 releases/{weekly => }/specs/sparc/sparc/stage1.spec                 | 2 +-
 releases/{weekly => }/specs/sparc/sparc/stage2.spec                 | 2 +-
 releases/{weekly => }/specs/sparc/sparc/stage3.spec                 | 2 +-
 releases/{weekly => }/specs/sparc/sparc/systemd-stage1.spec         | 2 +-
 releases/{weekly => }/specs/sparc/sparc/systemd-stage2.spec         | 2 +-
 releases/{weekly => }/specs/sparc/sparc/systemd-stage3.spec         | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/installcd-stage1.spec     | 2 +-
 .../{weekly => }/specs/sparc/sparc64/installcd-stage2-minimal.spec  | 4 ++--
 releases/{weekly => }/specs/sparc/sparc64/multilib/stage1.spec      | 0
 releases/{weekly => }/specs/sparc/sparc64/multilib/stage2.spec      | 0
 releases/{weekly => }/specs/sparc/sparc64/multilib/stage3.spec      | 0
 releases/{weekly => }/specs/sparc/sparc64/netboot.spec              | 0
 releases/{weekly => }/specs/sparc/sparc64/stage1.spec               | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/stage2.spec               | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/stage3.spec               | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/systemd-stage1.spec       | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/systemd-stage2.spec       | 2 +-
 releases/{weekly => }/specs/sparc/sparc64/systemd-stage3.spec       | 2 +-
 releases/{weekly => }/specs/x86/hardened/admincd-stage1.spec        | 2 +-
 releases/{weekly => }/specs/x86/hardened/admincd-stage2.spec        | 4 ++--
 releases/{weekly => }/specs/x86/hardened/installcd-stage1.spec      | 0
 .../{weekly => }/specs/x86/hardened/installcd-stage2-minimal.spec   | 2 +-
 releases/{weekly => }/specs/x86/hardened/stage1.spec                | 2 +-
 releases/{weekly => }/specs/x86/hardened/stage2.spec                | 2 +-
 releases/{weekly => }/specs/x86/hardened/stage3.spec                | 2 +-
 releases/{weekly => }/specs/x86/i686/hardened/stage2.spec           | 0
 releases/{weekly => }/specs/x86/i686/hardened/stage3.spec           | 0
 releases/{weekly => }/specs/x86/i686/livecd-stage1.spec             | 0
 releases/{weekly => }/specs/x86/i686/livecd-stage2.spec             | 0
 releases/{weekly => }/specs/x86/i686/livedvd-stage1.spec            | 0
 releases/{weekly => }/specs/x86/i686/livedvd-stage2.spec            | 0
 releases/{weekly => }/specs/x86/i686/stage1.spec                    | 2 +-
 releases/{weekly => }/specs/x86/i686/stage2-desktop.spec            | 0
 releases/{weekly => }/specs/x86/i686/stage2.spec                    | 2 +-
 releases/{weekly => }/specs/x86/i686/stage3-desktop.spec            | 0
 releases/{weekly => }/specs/x86/i686/stage3.spec                    | 2 +-
 releases/{weekly => }/specs/x86/installcd-stage1.spec               | 2 +-
 releases/{weekly => }/specs/x86/installcd-stage2-minimal.spec       | 4 ++--
 releases/{weekly => }/specs/x86/stage1.spec                         | 2 +-
 releases/{weekly => }/specs/x86/stage2.spec                         | 2 +-
 releases/{weekly => }/specs/x86/stage3.spec                         | 2 +-
 tools-musl/stage4-hardened-amd64.spec                               | 2 +-
 tools-systemd/stage4-amd64.spec                                     | 4 ++--
 tools/catalyst-auto-alpha.conf                                      | 4 ++--
 tools/catalyst-auto-amd64-experimental.conf                         | 4 ++--
 tools/catalyst-auto-amd64.conf                                      | 4 ++--
 tools/catalyst-auto-arm64.conf                                      | 4 ++--
 tools/catalyst-auto-armv4tl.conf                                    | 4 ++--
 tools/catalyst-auto-armv5tel.conf                                   | 4 ++--
 tools/catalyst-auto-armv6j.conf                                     | 4 ++--
 tools/catalyst-auto-armv6j_hardfp.conf                              | 4 ++--
 tools/catalyst-auto-armv7a.conf                                     | 4 ++--
 tools/catalyst-auto-armv7a_hardfp.conf                              | 4 ++--
 tools/catalyst-auto-hppa.conf                                       | 4 ++--
 tools/catalyst-auto-ia64.conf                                       | 4 ++--
 tools/catalyst-auto-ppc.conf                                        | 4 ++--
 tools/catalyst-auto-ppc64le.conf                                    | 4 ++--
 tools/catalyst-auto-s390.conf                                       | 4 ++--
 tools/catalyst-auto-s390x.conf                                      | 4 ++--
 tools/catalyst-auto-sparc64.conf                                    | 4 ++--
 tools/catalyst-auto-x86-experimental.conf                           | 4 ++--
 tools/catalyst-auto-x86.conf                                        | 4 ++--
 313 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/releases/weekly/kconfig/alpha/installcd-4.14.83.config b/releases/kconfig/alpha/installcd-4.14.83.config
similarity index 100%
rename from releases/weekly/kconfig/alpha/installcd-4.14.83.config
rename to releases/kconfig/alpha/installcd-4.14.83.config

diff --git a/releases/weekly/kconfig/alpha/installcd-4.14.83.nolsa.config b/releases/kconfig/alpha/installcd-4.14.83.nolsa.config
similarity index 100%
rename from releases/weekly/kconfig/alpha/installcd-4.14.83.nolsa.config
rename to releases/kconfig/alpha/installcd-4.14.83.nolsa.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.11.7.config b/releases/kconfig/amd64/admincd-3.11.7.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.11.7.config
rename to releases/kconfig/amd64/admincd-3.11.7.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.14.5-r2.config b/releases/kconfig/amd64/admincd-3.14.5-r2.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.14.5-r2.config
rename to releases/kconfig/amd64/admincd-3.14.5-r2.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.15.8.config b/releases/kconfig/amd64/admincd-3.15.8.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.15.8.config
rename to releases/kconfig/amd64/admincd-3.15.8.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.18.9.config b/releases/kconfig/amd64/admincd-3.18.9.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.18.9.config
rename to releases/kconfig/amd64/admincd-3.18.9.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config b/releases/kconfig/amd64/admincd-3.8.3-selinux.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
rename to releases/kconfig/amd64/admincd-3.8.3-selinux.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.8.3.config b/releases/kconfig/amd64/admincd-3.8.3.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.8.3.config
rename to releases/kconfig/amd64/admincd-3.8.3.config

diff --git a/releases/weekly/kconfig/amd64/admincd-3.9.5.config b/releases/kconfig/amd64/admincd-3.9.5.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-3.9.5.config
rename to releases/kconfig/amd64/admincd-3.9.5.config

diff --git a/releases/weekly/kconfig/amd64/admincd-4.14.83.config b/releases/kconfig/amd64/admincd-4.14.83.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-4.14.83.config
rename to releases/kconfig/amd64/admincd-4.14.83.config

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
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config
rename to releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config

diff --git a/releases/weekly/kconfig/amd64/admincd-4.4.8-r1.config b/releases/kconfig/amd64/admincd-4.4.8-r1.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/admincd-4.4.8-r1.config
rename to releases/kconfig/amd64/admincd-4.4.8-r1.config

diff --git a/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config b/releases/kconfig/amd64/cloud-amd64-gentoo.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
rename to releases/kconfig/amd64/cloud-amd64-gentoo.config

diff --git a/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config b/releases/kconfig/amd64/cloud-amd64-hardened.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
rename to releases/kconfig/amd64/cloud-amd64-hardened.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.10.17.config b/releases/kconfig/amd64/installcd-3.10.17.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.10.17.config
rename to releases/kconfig/amd64/installcd-3.10.17.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.12.21.config b/releases/kconfig/amd64/installcd-3.12.21.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.12.21.config
rename to releases/kconfig/amd64/installcd-3.12.21.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.16.5.config b/releases/kconfig/amd64/installcd-3.16.5.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.16.5.config
rename to releases/kconfig/amd64/installcd-3.16.5.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.18.12.config b/releases/kconfig/amd64/installcd-3.18.12.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.18.12.config
rename to releases/kconfig/amd64/installcd-3.18.12.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.7.4.config b/releases/kconfig/amd64/installcd-3.7.4.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.7.4.config
rename to releases/kconfig/amd64/installcd-3.7.4.config

diff --git a/releases/weekly/kconfig/amd64/installcd-3.8.13.config b/releases/kconfig/amd64/installcd-3.8.13.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-3.8.13.config
rename to releases/kconfig/amd64/installcd-3.8.13.config

diff --git a/releases/weekly/kconfig/amd64/installcd-4.14.52.config b/releases/kconfig/amd64/installcd-4.14.52.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-4.14.52.config
rename to releases/kconfig/amd64/installcd-4.14.52.config

diff --git a/releases/weekly/kconfig/amd64/installcd-4.4.6.config b/releases/kconfig/amd64/installcd-4.4.6.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/installcd-4.4.6.config
rename to releases/kconfig/amd64/installcd-4.4.6.config

diff --git a/releases/weekly/kconfig/amd64/livecd-2.6.24.config b/releases/kconfig/amd64/livecd-2.6.24.config
similarity index 100%
rename from releases/weekly/kconfig/amd64/livecd-2.6.24.config
rename to releases/kconfig/amd64/livecd-2.6.24.config

diff --git a/releases/weekly/kconfig/arm64/packet-arm64.config b/releases/kconfig/arm64/packet-arm64.config
similarity index 100%
rename from releases/weekly/kconfig/arm64/packet-arm64.config
rename to releases/kconfig/arm64/packet-arm64.config

diff --git a/releases/weekly/kconfig/hppa/installcd-2.6.24-livecd32.config b/releases/kconfig/hppa/installcd-2.6.24-livecd32.config
similarity index 100%
rename from releases/weekly/kconfig/hppa/installcd-2.6.24-livecd32.config
rename to releases/kconfig/hppa/installcd-2.6.24-livecd32.config

diff --git a/releases/weekly/kconfig/hppa/installcd-2.6.24-livecd64.config b/releases/kconfig/hppa/installcd-2.6.24-livecd64.config
similarity index 100%
rename from releases/weekly/kconfig/hppa/installcd-2.6.24-livecd64.config
rename to releases/kconfig/hppa/installcd-2.6.24-livecd64.config

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
similarity index 100%
rename from releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config
rename to releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd32.config

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
similarity index 100%
rename from releases/weekly/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config
rename to releases/kconfig/hppa/installcd-3.10.7-gentoo-livecd64.config

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
similarity index 100%
rename from releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
rename to releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config

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
similarity index 100%
rename from releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
rename to releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config

diff --git a/releases/weekly/kconfig/ia64/installcd-3.8.13.config b/releases/kconfig/ia64/installcd-3.8.13.config
similarity index 100%
rename from releases/weekly/kconfig/ia64/installcd-3.8.13.config
rename to releases/kconfig/ia64/installcd-3.8.13.config

diff --git a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config b/releases/kconfig/powerpc/installcd-ibm-4.19.config
similarity index 100%
rename from releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config
rename to releases/kconfig/powerpc/installcd-ibm-4.19.config

diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config
similarity index 100%
rename from releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config
rename to releases/kconfig/powerpc/installcd-ppc32apple-4.19.config

diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config
similarity index 100%
rename from releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config
rename to releases/kconfig/powerpc/installcd-ppc64apple-4.19.config

diff --git a/releases/weekly/kconfig/s390/netboot64.config b/releases/kconfig/s390/netboot64.config
similarity index 100%
rename from releases/weekly/kconfig/s390/netboot64.config
rename to releases/kconfig/s390/netboot64.config

diff --git a/releases/weekly/kconfig/sparc/installcd-3.8.13.config b/releases/kconfig/sparc/installcd-3.8.13.config
similarity index 100%
rename from releases/weekly/kconfig/sparc/installcd-3.8.13.config
rename to releases/kconfig/sparc/installcd-3.8.13.config

diff --git a/releases/weekly/kconfig/sparc/installcd-4.14.39.config b/releases/kconfig/sparc/installcd-4.14.39.config
similarity index 100%
rename from releases/weekly/kconfig/sparc/installcd-4.14.39.config
rename to releases/kconfig/sparc/installcd-4.14.39.config

diff --git a/releases/weekly/kconfig/sparc/installcd-4.14.83.config b/releases/kconfig/sparc/installcd-4.14.83.config
similarity index 100%
rename from releases/weekly/kconfig/sparc/installcd-4.14.83.config
rename to releases/kconfig/sparc/installcd-4.14.83.config

diff --git a/releases/weekly/kconfig/sparc/installcd-4.19.44.config b/releases/kconfig/sparc/installcd-4.19.44.config
similarity index 100%
rename from releases/weekly/kconfig/sparc/installcd-4.19.44.config
rename to releases/kconfig/sparc/installcd-4.19.44.config

diff --git a/releases/weekly/kconfig/x86/admincd-3.0.config b/releases/kconfig/x86/admincd-3.0.config
similarity index 100%
rename from releases/weekly/kconfig/x86/admincd-3.0.config
rename to releases/kconfig/x86/admincd-3.0.config

diff --git a/releases/weekly/kconfig/x86/admincd-3.18.9.config b/releases/kconfig/x86/admincd-3.18.9.config
similarity index 100%
rename from releases/weekly/kconfig/x86/admincd-3.18.9.config
rename to releases/kconfig/x86/admincd-3.18.9.config

diff --git a/releases/weekly/kconfig/x86/admincd-3.2.config b/releases/kconfig/x86/admincd-3.2.config
similarity index 100%
rename from releases/weekly/kconfig/x86/admincd-3.2.config
rename to releases/kconfig/x86/admincd-3.2.config

diff --git a/releases/weekly/kconfig/x86/admincd-3.4.2.config b/releases/kconfig/x86/admincd-3.4.2.config
similarity index 100%
rename from releases/weekly/kconfig/x86/admincd-3.4.2.config
rename to releases/kconfig/x86/admincd-3.4.2.config

diff --git a/releases/weekly/kconfig/x86/admincd-3.9.5.config b/releases/kconfig/x86/admincd-3.9.5.config
similarity index 100%
rename from releases/weekly/kconfig/x86/admincd-3.9.5.config
rename to releases/kconfig/x86/admincd-3.9.5.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.24.config b/releases/kconfig/x86/installcd-2.6.24.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.24.config
rename to releases/kconfig/x86/installcd-2.6.24.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.27.config b/releases/kconfig/x86/installcd-2.6.27.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.27.config
rename to releases/kconfig/x86/installcd-2.6.27.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.28.config b/releases/kconfig/x86/installcd-2.6.28.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.28.config
rename to releases/kconfig/x86/installcd-2.6.28.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.31.config b/releases/kconfig/x86/installcd-2.6.31.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.31.config
rename to releases/kconfig/x86/installcd-2.6.31.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.37.config b/releases/kconfig/x86/installcd-2.6.37.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.37.config
rename to releases/kconfig/x86/installcd-2.6.37.config

diff --git a/releases/weekly/kconfig/x86/installcd-2.6.38.config b/releases/kconfig/x86/installcd-2.6.38.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-2.6.38.config
rename to releases/kconfig/x86/installcd-2.6.38.config

diff --git a/releases/weekly/kconfig/x86/installcd-3.18.12.config b/releases/kconfig/x86/installcd-3.18.12.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-3.18.12.config
rename to releases/kconfig/x86/installcd-3.18.12.config

diff --git a/releases/weekly/kconfig/x86/installcd-3.4.2.config b/releases/kconfig/x86/installcd-3.4.2.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-3.4.2.config
rename to releases/kconfig/x86/installcd-3.4.2.config

diff --git a/releases/weekly/kconfig/x86/installcd-3.8.13.config b/releases/kconfig/x86/installcd-3.8.13.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-3.8.13.config
rename to releases/kconfig/x86/installcd-3.8.13.config

diff --git a/releases/weekly/kconfig/x86/installcd-4.14.52.config b/releases/kconfig/x86/installcd-4.14.52.config
similarity index 100%
rename from releases/weekly/kconfig/x86/installcd-4.14.52.config
rename to releases/kconfig/x86/installcd-4.14.52.config

diff --git a/releases/weekly/kconfig/x86/livecd-2.6.24.config b/releases/kconfig/x86/livecd-2.6.24.config
similarity index 100%
rename from releases/weekly/kconfig/x86/livecd-2.6.24.config
rename to releases/kconfig/x86/livecd-2.6.24.config

diff --git a/releases/weekly/overlays/common/overlay/installcd/distfiles/README b/releases/overlays/common/overlay/installcd/distfiles/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/installcd/distfiles/README
rename to releases/overlays/common/overlay/installcd/distfiles/README

diff --git a/releases/weekly/overlays/common/overlay/installcd/docs/README b/releases/overlays/common/overlay/installcd/docs/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/installcd/docs/README
rename to releases/overlays/common/overlay/installcd/docs/README

diff --git a/releases/weekly/overlays/common/overlay/installcd/snapshots/README b/releases/overlays/common/overlay/installcd/snapshots/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/installcd/snapshots/README
rename to releases/overlays/common/overlay/installcd/snapshots/README

diff --git a/releases/weekly/overlays/common/overlay/installcd/stages/README b/releases/overlays/common/overlay/installcd/stages/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/installcd/stages/README
rename to releases/overlays/common/overlay/installcd/stages/README

diff --git a/releases/weekly/overlays/common/overlay/livecd/docs/README b/releases/overlays/common/overlay/livecd/docs/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livecd/docs/README
rename to releases/overlays/common/overlay/livecd/docs/README

diff --git a/releases/weekly/overlays/common/overlay/livecd/snapshots/README b/releases/overlays/common/overlay/livecd/snapshots/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livecd/snapshots/README
rename to releases/overlays/common/overlay/livecd/snapshots/README

diff --git a/releases/weekly/overlays/common/overlay/livedvd/distfiles/README b/releases/overlays/common/overlay/livedvd/distfiles/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livedvd/distfiles/README
rename to releases/overlays/common/overlay/livedvd/distfiles/README

diff --git a/releases/weekly/overlays/common/overlay/livedvd/docs/README b/releases/overlays/common/overlay/livedvd/docs/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livedvd/docs/README
rename to releases/overlays/common/overlay/livedvd/docs/README

diff --git a/releases/weekly/overlays/common/overlay/livedvd/snapshots/README b/releases/overlays/common/overlay/livedvd/snapshots/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livedvd/snapshots/README
rename to releases/overlays/common/overlay/livedvd/snapshots/README

diff --git a/releases/weekly/overlays/common/overlay/livedvd/stages/README b/releases/overlays/common/overlay/livedvd/stages/README
similarity index 100%
rename from releases/weekly/overlays/common/overlay/livedvd/stages/README
rename to releases/overlays/common/overlay/livedvd/stages/README

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
similarity index 100%
rename from releases/weekly/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml
rename to releases/overlays/common/root_overlay/home/gentoo/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fgentoo%2FDesktop.xml

diff --git a/releases/weekly/overlays/common/root_overlay/home/gentoo/.xscreensaver b/releases/overlays/common/root_overlay/home/gentoo/.xscreensaver
similarity index 100%
rename from releases/weekly/overlays/common/root_overlay/home/gentoo/.xscreensaver
rename to releases/overlays/common/root_overlay/home/gentoo/.xscreensaver

diff --git a/releases/weekly/portage/isos/package.accept_keywords/admincd-packages b/releases/portage/isos/package.accept_keywords/admincd-packages
similarity index 100%
rename from releases/weekly/portage/isos/package.accept_keywords/admincd-packages
rename to releases/portage/isos/package.accept_keywords/admincd-packages

diff --git a/releases/weekly/portage/isos/package.accept_keywords/zfs b/releases/portage/isos/package.accept_keywords/zfs
similarity index 100%
rename from releases/weekly/portage/isos/package.accept_keywords/zfs
rename to releases/portage/isos/package.accept_keywords/zfs

diff --git a/releases/weekly/portage/isos/package.license/package.license b/releases/portage/isos/package.license/package.license
similarity index 100%
rename from releases/weekly/portage/isos/package.license/package.license
rename to releases/portage/isos/package.license/package.license

diff --git a/releases/weekly/portage/isos/package.use/admincd-packages b/releases/portage/isos/package.use/admincd-packages
similarity index 100%
rename from releases/weekly/portage/isos/package.use/admincd-packages
rename to releases/portage/isos/package.use/admincd-packages

diff --git a/releases/weekly/portage/isos/package.use/cifs-utils b/releases/portage/isos/package.use/cifs-utils
similarity index 100%
rename from releases/weekly/portage/isos/package.use/cifs-utils
rename to releases/portage/isos/package.use/cifs-utils

diff --git a/releases/weekly/portage/isos/package.use/genkernel b/releases/portage/isos/package.use/genkernel
similarity index 100%
rename from releases/weekly/portage/isos/package.use/genkernel
rename to releases/portage/isos/package.use/genkernel

diff --git a/releases/weekly/portage/isos/package.use/linux-firmware b/releases/portage/isos/package.use/linux-firmware
similarity index 100%
rename from releases/weekly/portage/isos/package.use/linux-firmware
rename to releases/portage/isos/package.use/linux-firmware

diff --git a/releases/weekly/portage/isos/savedconfig/sys-kernel/linux-firmware b/releases/portage/isos/savedconfig/sys-kernel/linux-firmware
similarity index 100%
rename from releases/weekly/portage/isos/savedconfig/sys-kernel/linux-firmware
rename to releases/portage/isos/savedconfig/sys-kernel/linux-firmware

diff --git a/releases/weekly/portage/stages/package.use/releng/libpcre b/releases/portage/stages/package.use/releng/libpcre
similarity index 100%
rename from releases/weekly/portage/stages/package.use/releng/libpcre
rename to releases/portage/stages/package.use/releng/libpcre

diff --git a/releases/weekly/portage/stages/package.use/releng/no-filecaps b/releases/portage/stages/package.use/releng/no-filecaps
similarity index 100%
rename from releases/weekly/portage/stages/package.use/releng/no-filecaps
rename to releases/portage/stages/package.use/releng/no-filecaps

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/scripts/cloud-prep.sh
similarity index 100%
rename from releases/weekly/scripts/cloud-prep.sh
rename to releases/scripts/cloud-prep.sh

diff --git a/releases/weekly/scripts/livecd.sh b/releases/scripts/livecd.sh
similarity index 100%
rename from releases/weekly/scripts/livecd.sh
rename to releases/scripts/livecd.sh

diff --git a/releases/weekly/specs/alpha/installcd-stage1.spec b/releases/specs/alpha/installcd-stage1.spec
similarity index 95%
rename from releases/weekly/specs/alpha/installcd-stage1.spec
rename to releases/specs/alpha/installcd-stage1.spec
index 2e540247..726f717f 100644
--- a/releases/weekly/specs/alpha/installcd-stage1.spec
+++ b/releases/specs/alpha/installcd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/alpha/17.0
 snapshot: 2008.0
 source_subpath: default/stage3-alpha-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 livecd/use:
 	compile-locales
 	fbcon

diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec b/releases/specs/alpha/installcd-stage2-minimal.spec
similarity index 98%
rename from releases/weekly/specs/alpha/installcd-stage2-minimal.spec
rename to releases/specs/alpha/installcd-stage2-minimal.spec
index 0a117287..e595eb2c 100644
--- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
+++ b/releases/specs/alpha/installcd-stage2-minimal.spec
@@ -5,11 +5,11 @@ rel_type: default
 profile: default/linux/alpha/17.0
 snapshot: 2008.0
 source_subpath: default/livecd-stage1-alpha-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /root/aboot-1.0_pre20040408-r2-cdtar-weekly.tar.bz2
-livecd/fsscript: /root/releng/releases/weekly/scripts/livecd.sh
+livecd/fsscript: /root/releng/releases/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-minimal-2008.0.iso
 livecd/type: gentoo-release-minimal

diff --git a/releases/weekly/specs/alpha/netboot/bs.conf b/releases/specs/alpha/netboot/bs.conf
similarity index 100%
rename from releases/weekly/specs/alpha/netboot/bs.conf
rename to releases/specs/alpha/netboot/bs.conf

diff --git a/releases/weekly/specs/alpha/netboot/cmd b/releases/specs/alpha/netboot/cmd
similarity index 100%
rename from releases/weekly/specs/alpha/netboot/cmd
rename to releases/specs/alpha/netboot/cmd

diff --git a/releases/weekly/specs/alpha/netboot/config b/releases/specs/alpha/netboot/config
similarity index 100%
rename from releases/weekly/specs/alpha/netboot/config
rename to releases/specs/alpha/netboot/config

diff --git a/releases/weekly/specs/alpha/netboot/netboot2.spec b/releases/specs/alpha/netboot/netboot2.spec
similarity index 100%
rename from releases/weekly/specs/alpha/netboot/netboot2.spec
rename to releases/specs/alpha/netboot/netboot2.spec

diff --git a/releases/weekly/specs/alpha/stage1.spec b/releases/specs/alpha/stage1.spec
similarity index 75%
rename from releases/weekly/specs/alpha/stage1.spec
rename to releases/specs/alpha/stage1.spec
index 7e768f50..89686b27 100644
--- a/releases/weekly/specs/alpha/stage1.spec
+++ b/releases/specs/alpha/stage1.spec
@@ -6,4 +6,4 @@ profile: default/linux/alpha/17.0
 snapshot: 2008.0
 source_subpath: default/stage3-alpha-latest
 update_seed: yes
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/alpha/stage2.spec b/releases/specs/alpha/stage2.spec
similarity index 73%
rename from releases/weekly/specs/alpha/stage2.spec
rename to releases/specs/alpha/stage2.spec
index 16677d2e..f0afaba2 100644
--- a/releases/weekly/specs/alpha/stage2.spec
+++ b/releases/specs/alpha/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
 profile: default/linux/alpha/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-alpha-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/alpha/stage3.spec b/releases/specs/alpha/stage3.spec
similarity index 73%
rename from releases/weekly/specs/alpha/stage3.spec
rename to releases/specs/alpha/stage3.spec
index dd26843f..679ffab7 100644
--- a/releases/weekly/specs/alpha/stage3.spec
+++ b/releases/specs/alpha/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
 profile: default/linux/alpha/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-alpha-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
similarity index 98%
rename from releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
rename to releases/specs/amd64/hardened/admincd-stage1-selinux.spec
index 5db7798b..706e35e3 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/hardened/selinux
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	alsa

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec
similarity index 98%
rename from releases/weekly/specs/amd64/hardened/admincd-stage1.spec
rename to releases/specs/amd64/hardened/admincd-stage1.spec
index b1aa74ee..5121cf54 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/specs/amd64/hardened/admincd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/amd64/17.1/hardened
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	alsa

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
similarity index 96%
rename from releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
rename to releases/specs/amd64/hardened/admincd-stage2-selinux.spec
index 9d00482c..7306688b 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.0/hardened/selinux
 snapshot: latest
 source_subpath: hardened/livecd-stage1-amd64-latest-selinux
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs
@@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config
 
 #boot/kernel/gentoo/packages:
 #	ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
similarity index 97%
rename from releases/weekly/specs/amd64/hardened/admincd-stage2.spec
rename to releases/specs/amd64/hardened/admincd-stage2.spec
index 6997f55a..90d836cc 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.1/hardened
 snapshot: latest
 source_subpath: hardened/livecd-stage1-amd64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs
@@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.14.83.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.14.83.config
 
 #boot/kernel/gentoo/packages:
 #	ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK

diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/specs/amd64/hardened/stage1-nomultilib.spec
similarity index 86%
rename from releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
rename to releases/specs/amd64/hardened/stage1-nomultilib.spec
index 2a5e1d8b..8d659e0b 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage1-nomultilib.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
similarity index 87%
rename from releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
rename to releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index c38147e5..88c22d92 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/specs/amd64/hardened/stage1-selinux.spec
similarity index 86%
rename from releases/weekly/specs/amd64/hardened/stage1-selinux.spec
rename to releases/specs/amd64/hardened/stage1-selinux.spec
index 28174034..4956f9d1 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/specs/amd64/hardened/stage1-selinux.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/specs/amd64/hardened/stage1.spec
similarity index 85%
rename from releases/weekly/specs/amd64/hardened/stage1.spec
rename to releases/specs/amd64/hardened/stage1.spec
index 7bac6cfc..5fe18de4 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/specs/amd64/hardened/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/specs/amd64/hardened/stage2-nomultilib.spec
similarity index 84%
rename from releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
rename to releases/specs/amd64/hardened/stage2-nomultilib.spec
index db760bfb..32af0240 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage2-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
similarity index 85%
rename from releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
rename to releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index 7f3a2c08..c816ad6b 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/specs/amd64/hardened/stage2-selinux.spec
similarity index 84%
rename from releases/weekly/specs/amd64/hardened/stage2-selinux.spec
rename to releases/specs/amd64/hardened/stage2-selinux.spec
index 331817e8..ab84ad81 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/specs/amd64/hardened/stage2-selinux.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage1-amd64-hardened-selinux-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/specs/amd64/hardened/stage2.spec
similarity index 83%
rename from releases/weekly/specs/amd64/hardened/stage2.spec
rename to releases/specs/amd64/hardened/stage2.spec
index 48230471..8bb40f3f 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/specs/amd64/hardened/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage1-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/specs/amd64/hardened/stage3-nomultilib.spec
similarity index 84%
rename from releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
rename to releases/specs/amd64/hardened/stage3-nomultilib.spec
index 839223bf..2a518ac1 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage3-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
similarity index 85%
rename from releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
rename to releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index f4ddbbde..7f0a42ea 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/specs/amd64/hardened/stage3-selinux.spec
similarity index 84%
rename from releases/weekly/specs/amd64/hardened/stage3-selinux.spec
rename to releases/specs/amd64/hardened/stage3-selinux.spec
index e0f1d9bb..2c273f3b 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/specs/amd64/hardened/stage3-selinux.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage2-amd64-hardened-selinux-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/specs/amd64/hardened/stage3.spec
similarity index 83%
rename from releases/weekly/specs/amd64/hardened/stage3.spec
rename to releases/specs/amd64/hardened/stage3.spec
index 4006ede9..ae6ed00a 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/specs/amd64/hardened/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage2-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/specs/amd64/hardened/stage4-minimal.spec
similarity index 85%
rename from releases/weekly/specs/amd64/hardened/stage4-minimal.spec
rename to releases/specs/amd64/hardened/stage4-minimal.spec
index 7a0b32e3..e93c034d 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/specs/amd64/hardened/stage4-minimal.spec
@@ -7,7 +7,7 @@ snapshot: latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 stage4/use:
 	bindist
@@ -25,7 +25,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -34,7 +34,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
similarity index 86%
rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
rename to releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index 52d230e3..e0cab1d3 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -7,7 +7,7 @@ snapshot: latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 stage4/use:
 	bindist
@@ -25,7 +25,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -34,7 +34,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/specs/amd64/installcd-stage1.spec
similarity index 97%
rename from releases/weekly/specs/amd64/installcd-stage1.spec
rename to releases/specs/amd64/installcd-stage1.spec
index 9ef6c941..a3885784 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/specs/amd64/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/amd64/17.1/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	alsa

diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec
similarity index 96%
rename from releases/weekly/specs/amd64/installcd-stage2-minimal.spec
rename to releases/specs/amd64/installcd-stage2-minimal.spec
index 4ba33b34..3ae17ccb 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/specs/amd64/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/17.1/no-multilib
 snapshot: latest
 source_subpath: default/livecd-stage1-amd64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs
@@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/installcd-4.14.52.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/installcd-4.14.52.config
 
 livecd/unmerge:
 	app-admin/eselect

diff --git a/releases/weekly/specs/amd64/livecd-stage1.spec b/releases/specs/amd64/livecd-stage1.spec
similarity index 100%
rename from releases/weekly/specs/amd64/livecd-stage1.spec
rename to releases/specs/amd64/livecd-stage1.spec

diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/specs/amd64/livecd-stage2.spec
similarity index 100%
rename from releases/weekly/specs/amd64/livecd-stage2.spec
rename to releases/specs/amd64/livecd-stage2.spec

diff --git a/releases/weekly/specs/amd64/livedvd-stage1.spec b/releases/specs/amd64/livedvd-stage1.spec
similarity index 100%
rename from releases/weekly/specs/amd64/livedvd-stage1.spec
rename to releases/specs/amd64/livedvd-stage1.spec

diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/specs/amd64/livedvd-stage2.spec
similarity index 100%
rename from releases/weekly/specs/amd64/livedvd-stage2.spec
rename to releases/specs/amd64/livedvd-stage2.spec

diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/specs/amd64/stage1-nomultilib.spec
similarity index 86%
rename from releases/weekly/specs/amd64/stage1-nomultilib.spec
rename to releases/specs/amd64/stage1-nomultilib.spec
index 43502eae..fc457286 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/specs/amd64/stage1-nomultilib.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/specs/amd64/stage1-x32.spec
similarity index 84%
rename from releases/weekly/specs/amd64/stage1-x32.spec
rename to releases/specs/amd64/stage1-x32.spec
index e8ee6f72..e55bf9ed 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/specs/amd64/stage1-x32.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/specs/amd64/stage1.spec
similarity index 84%
rename from releases/weekly/specs/amd64/stage1.spec
rename to releases/specs/amd64/stage1.spec
index 8cd84fa8..a1781ac0 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/specs/amd64/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage2-desktop.spec b/releases/specs/amd64/stage2-desktop.spec
similarity index 100%
rename from releases/weekly/specs/amd64/stage2-desktop.spec
rename to releases/specs/amd64/stage2-desktop.spec

diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/specs/amd64/stage2-nomultilib.spec
similarity index 83%
rename from releases/weekly/specs/amd64/stage2-nomultilib.spec
rename to releases/specs/amd64/stage2-nomultilib.spec
index a9ba2b65..bb33a7a3 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/specs/amd64/stage2-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/specs/amd64/stage2-x32.spec
similarity index 82%
rename from releases/weekly/specs/amd64/stage2-x32.spec
rename to releases/specs/amd64/stage2-x32.spec
index e9b6138f..ad81688a 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/specs/amd64/stage2-x32.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/specs/amd64/stage2.spec
similarity index 82%
rename from releases/weekly/specs/amd64/stage2.spec
rename to releases/specs/amd64/stage2.spec
index d199b5dd..321e028e 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/specs/amd64/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage3-desktop.spec b/releases/specs/amd64/stage3-desktop.spec
similarity index 100%
rename from releases/weekly/specs/amd64/stage3-desktop.spec
rename to releases/specs/amd64/stage3-desktop.spec

diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/specs/amd64/stage3-nomultilib.spec
similarity index 83%
rename from releases/weekly/specs/amd64/stage3-nomultilib.spec
rename to releases/specs/amd64/stage3-nomultilib.spec
index 6469aba8..a358759a 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/specs/amd64/stage3-nomultilib.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage2-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/specs/amd64/stage3-x32.spec
similarity index 82%
rename from releases/weekly/specs/amd64/stage3-x32.spec
rename to releases/specs/amd64/stage3-x32.spec
index 5c9417e3..b38f0b37 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/specs/amd64/stage3-x32.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage2-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/specs/amd64/stage3.spec
similarity index 82%
rename from releases/weekly/specs/amd64/stage3.spec
rename to releases/specs/amd64/stage3.spec
index 6caacc13..04798a64 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/specs/amd64/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage2-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/specs/amd64/stage4-minimal.spec
similarity index 85%
rename from releases/weekly/specs/amd64/stage4-minimal.spec
rename to releases/specs/amd64/stage4-minimal.spec
index 40e4b5b5..8037baa5 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/specs/amd64/stage4-minimal.spec
@@ -7,7 +7,7 @@ snapshot: latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-amd64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 stage4/use:
 	bindist
@@ -25,7 +25,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -34,7 +34,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/specs/amd64/stage4-nomultilib-minimal.spec
similarity index 85%
rename from releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
rename to releases/specs/amd64/stage4-nomultilib-minimal.spec
index 26020050..9bc36df5 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/specs/amd64/stage4-nomultilib-minimal.spec
@@ -7,7 +7,7 @@ snapshot: latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 stage4/use:
 	bindist
@@ -25,7 +25,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -34,7 +34,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/releases/weekly/specs/arm/armeb/stage1.spec b/releases/specs/arm/armeb/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armeb/stage1.spec
rename to releases/specs/arm/armeb/stage1.spec

diff --git a/releases/weekly/specs/arm/armeb/stage2.spec b/releases/specs/arm/armeb/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armeb/stage2.spec
rename to releases/specs/arm/armeb/stage2.spec

diff --git a/releases/weekly/specs/arm/armeb/stage3.spec b/releases/specs/arm/armeb/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armeb/stage3.spec
rename to releases/specs/arm/armeb/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4l/stage1.spec b/releases/specs/arm/armv4l/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/stage1.spec
rename to releases/specs/arm/armv4l/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4l/stage2.spec b/releases/specs/arm/armv4l/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/stage2.spec
rename to releases/specs/arm/armv4l/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4l/stage3.spec b/releases/specs/arm/armv4l/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/stage3.spec
rename to releases/specs/arm/armv4l/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage1.spec b/releases/specs/arm/armv4l/strongarm/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm/stage1.spec
rename to releases/specs/arm/armv4l/strongarm/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage2.spec b/releases/specs/arm/armv4l/strongarm/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm/stage2.spec
rename to releases/specs/arm/armv4l/strongarm/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm/stage3.spec b/releases/specs/arm/armv4l/strongarm/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm/stage3.spec
rename to releases/specs/arm/armv4l/strongarm/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage1.spec b/releases/specs/arm/armv4l/strongarm110/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm110/stage1.spec
rename to releases/specs/arm/armv4l/strongarm110/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage2.spec b/releases/specs/arm/armv4l/strongarm110/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm110/stage2.spec
rename to releases/specs/arm/armv4l/strongarm110/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm110/stage3.spec b/releases/specs/arm/armv4l/strongarm110/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm110/stage3.spec
rename to releases/specs/arm/armv4l/strongarm110/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage1.spec b/releases/specs/arm/armv4l/strongarm1100/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage1.spec
rename to releases/specs/arm/armv4l/strongarm1100/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage2.spec b/releases/specs/arm/armv4l/strongarm1100/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage2.spec
rename to releases/specs/arm/armv4l/strongarm1100/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1100/stage3.spec b/releases/specs/arm/armv4l/strongarm1100/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1100/stage3.spec
rename to releases/specs/arm/armv4l/strongarm1100/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage1.spec b/releases/specs/arm/armv4l/strongarm1110/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage1.spec
rename to releases/specs/arm/armv4l/strongarm1110/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage2.spec b/releases/specs/arm/armv4l/strongarm1110/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage2.spec
rename to releases/specs/arm/armv4l/strongarm1110/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4l/strongarm1110/stage3.spec b/releases/specs/arm/armv4l/strongarm1110/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4l/strongarm1110/stage3.spec
rename to releases/specs/arm/armv4l/strongarm1110/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage1.spec b/releases/specs/arm/armv4tl/openmoko/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/openmoko/stage1.spec
rename to releases/specs/arm/armv4tl/openmoko/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage2.spec b/releases/specs/arm/armv4tl/openmoko/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/openmoko/stage2.spec
rename to releases/specs/arm/armv4tl/openmoko/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4tl/openmoko/stage3.spec b/releases/specs/arm/armv4tl/openmoko/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/openmoko/stage3.spec
rename to releases/specs/arm/armv4tl/openmoko/stage3.spec

diff --git a/releases/weekly/specs/arm/armv4tl/stage1.spec b/releases/specs/arm/armv4tl/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/stage1.spec
rename to releases/specs/arm/armv4tl/stage1.spec

diff --git a/releases/weekly/specs/arm/armv4tl/stage2.spec b/releases/specs/arm/armv4tl/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/stage2.spec
rename to releases/specs/arm/armv4tl/stage2.spec

diff --git a/releases/weekly/specs/arm/armv4tl/stage3.spec b/releases/specs/arm/armv4tl/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv4tl/stage3.spec
rename to releases/specs/arm/armv4tl/stage3.spec

diff --git a/releases/weekly/specs/arm/armv5teb/stage1.spec b/releases/specs/arm/armv5teb/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5teb/stage1.spec
rename to releases/specs/arm/armv5teb/stage1.spec

diff --git a/releases/weekly/specs/arm/armv5teb/stage2.spec b/releases/specs/arm/armv5teb/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5teb/stage2.spec
rename to releases/specs/arm/armv5teb/stage2.spec

diff --git a/releases/weekly/specs/arm/armv5teb/stage3.spec b/releases/specs/arm/armv5teb/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5teb/stage3.spec
rename to releases/specs/arm/armv5teb/stage3.spec

diff --git a/releases/weekly/specs/arm/armv5tejl/stage1.spec b/releases/specs/arm/armv5tejl/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tejl/stage1.spec
rename to releases/specs/arm/armv5tejl/stage1.spec

diff --git a/releases/weekly/specs/arm/armv5tejl/stage2.spec b/releases/specs/arm/armv5tejl/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tejl/stage2.spec
rename to releases/specs/arm/armv5tejl/stage2.spec

diff --git a/releases/weekly/specs/arm/armv5tejl/stage3.spec b/releases/specs/arm/armv5tejl/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tejl/stage3.spec
rename to releases/specs/arm/armv5tejl/stage3.spec

diff --git a/releases/weekly/specs/arm/armv5tel/stage1.spec b/releases/specs/arm/armv5tel/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tel/stage1.spec
rename to releases/specs/arm/armv5tel/stage1.spec

diff --git a/releases/weekly/specs/arm/armv5tel/stage2.spec b/releases/specs/arm/armv5tel/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tel/stage2.spec
rename to releases/specs/arm/armv5tel/stage2.spec

diff --git a/releases/weekly/specs/arm/armv5tel/stage3.spec b/releases/specs/arm/armv5tel/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tel/stage3.spec
rename to releases/specs/arm/armv5tel/stage3.spec

diff --git a/releases/weekly/specs/arm/armv5tl/stage1.spec b/releases/specs/arm/armv5tl/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tl/stage1.spec
rename to releases/specs/arm/armv5tl/stage1.spec

diff --git a/releases/weekly/specs/arm/armv5tl/stage2.spec b/releases/specs/arm/armv5tl/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tl/stage2.spec
rename to releases/specs/arm/armv5tl/stage2.spec

diff --git a/releases/weekly/specs/arm/armv5tl/stage3.spec b/releases/specs/arm/armv5tl/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv5tl/stage3.spec
rename to releases/specs/arm/armv5tl/stage3.spec

diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec b/releases/specs/arm/armv6j/hardfloat/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec
rename to releases/specs/arm/armv6j/hardfloat/stage1.spec

diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage2.spec b/releases/specs/arm/armv6j/hardfloat/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/hardfloat/stage2.spec
rename to releases/specs/arm/armv6j/hardfloat/stage2.spec

diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage3.spec b/releases/specs/arm/armv6j/hardfloat/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/hardfloat/stage3.spec
rename to releases/specs/arm/armv6j/hardfloat/stage3.spec

diff --git a/releases/weekly/specs/arm/armv6j/stage1.spec b/releases/specs/arm/armv6j/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/stage1.spec
rename to releases/specs/arm/armv6j/stage1.spec

diff --git a/releases/weekly/specs/arm/armv6j/stage2.spec b/releases/specs/arm/armv6j/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/stage2.spec
rename to releases/specs/arm/armv6j/stage2.spec

diff --git a/releases/weekly/specs/arm/armv6j/stage3.spec b/releases/specs/arm/armv6j/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv6j/stage3.spec
rename to releases/specs/arm/armv6j/stage3.spec

diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec b/releases/specs/arm/armv7a/hardfloat/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec
rename to releases/specs/arm/armv7a/hardfloat/stage1.spec

diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage2.spec b/releases/specs/arm/armv7a/hardfloat/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/hardfloat/stage2.spec
rename to releases/specs/arm/armv7a/hardfloat/stage2.spec

diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage3.spec b/releases/specs/arm/armv7a/hardfloat/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/hardfloat/stage3.spec
rename to releases/specs/arm/armv7a/hardfloat/stage3.spec

diff --git a/releases/weekly/specs/arm/armv7a/stage1.spec b/releases/specs/arm/armv7a/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/stage1.spec
rename to releases/specs/arm/armv7a/stage1.spec

diff --git a/releases/weekly/specs/arm/armv7a/stage2.spec b/releases/specs/arm/armv7a/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/stage2.spec
rename to releases/specs/arm/armv7a/stage2.spec

diff --git a/releases/weekly/specs/arm/armv7a/stage3.spec b/releases/specs/arm/armv7a/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/armv7a/stage3.spec
rename to releases/specs/arm/armv7a/stage3.spec

diff --git a/releases/weekly/specs/arm/stage1.spec b/releases/specs/arm/stage1.spec
similarity index 100%
rename from releases/weekly/specs/arm/stage1.spec
rename to releases/specs/arm/stage1.spec

diff --git a/releases/weekly/specs/arm/stage2.spec b/releases/specs/arm/stage2.spec
similarity index 100%
rename from releases/weekly/specs/arm/stage2.spec
rename to releases/specs/arm/stage2.spec

diff --git a/releases/weekly/specs/arm/stage3.spec b/releases/specs/arm/stage3.spec
similarity index 100%
rename from releases/weekly/specs/arm/stage3.spec
rename to releases/specs/arm/stage3.spec

diff --git a/releases/weekly/specs/arm64/stage1.spec b/releases/specs/arm64/stage1.spec
similarity index 84%
rename from releases/weekly/specs/arm64/stage1.spec
rename to releases/specs/arm64/stage1.spec
index 62d473ac..2f90e9f4 100644
--- a/releases/weekly/specs/arm64/stage1.spec
+++ b/releases/specs/arm64/stage1.spec
@@ -8,5 +8,5 @@ source_subpath: default/stage3-arm64-latest
 pkgcache_path: /var/tmp/catalyst/packages/stage1
 update_seed: yes
 update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/arm64/stage2.spec b/releases/specs/arm64/stage2.spec
similarity index 80%
rename from releases/weekly/specs/arm64/stage2.spec
rename to releases/specs/arm64/stage2.spec
index 9f0c2234..bd2a53af 100644
--- a/releases/weekly/specs/arm64/stage2.spec
+++ b/releases/specs/arm64/stage2.spec
@@ -6,5 +6,5 @@ profile: default/linux/arm64/17.0
 snapshot: current
 source_subpath: default/stage1-arm64-2008.0
 pkgcache_path: /var/tmp/catalyst/packages/stage2
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/arm64/stage3.spec b/releases/specs/arm64/stage3.spec
similarity index 80%
rename from releases/weekly/specs/arm64/stage3.spec
rename to releases/specs/arm64/stage3.spec
index 2758e99f..4844564a 100644
--- a/releases/weekly/specs/arm64/stage3.spec
+++ b/releases/specs/arm64/stage3.spec
@@ -6,5 +6,5 @@ profile: default/linux/arm64/17.0
 snapshot: current
 source_subpath: default/stage2-arm64-2008.0
 pkgcache_path: /var/tmp/catalyst/packages/stage3
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec b/releases/specs/arm64/stage4-minimal.spec
similarity index 85%
rename from releases/weekly/specs/arm64/stage4-minimal.spec
rename to releases/specs/arm64/stage4-minimal.spec
index af70604d..6bacc13c 100644
--- a/releases/weekly/specs/arm64/stage4-minimal.spec
+++ b/releases/specs/arm64/stage4-minimal.spec
@@ -7,7 +7,7 @@ snapshot: current
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-arm64-2008.0
-#portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+#portage_confdir: @REPO_DIR@/releases/portage/isos
 
 stage4/use:
 	bindist
@@ -24,7 +24,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-#stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+#stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -33,7 +33,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/arm64/packet-arm64.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/arm64/packet-arm64.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/releases/weekly/specs/hppa/hppa1.1/stage1.spec b/releases/specs/hppa/hppa1.1/stage1.spec
similarity index 80%
rename from releases/weekly/specs/hppa/hppa1.1/stage1.spec
rename to releases/specs/hppa/hppa1.1/stage1.spec
index d3f781ec..a15bf0ef 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage1.spec
+++ b/releases/specs/hppa/hppa1.1/stage1.spec
@@ -6,5 +6,5 @@ profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage3-hppa1.1-latest
 update_seed: yes
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1

diff --git a/releases/weekly/specs/hppa/hppa1.1/stage2.spec b/releases/specs/hppa/hppa1.1/stage2.spec
similarity index 79%
rename from releases/weekly/specs/hppa/hppa1.1/stage2.spec
rename to releases/specs/hppa/hppa1.1/stage2.spec
index acfd14e2..0ff24607 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage2.spec
+++ b/releases/specs/hppa/hppa1.1/stage2.spec
@@ -5,5 +5,5 @@ rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-hppa1.1-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa1.1

diff --git a/releases/weekly/specs/hppa/hppa1.1/stage3.spec b/releases/specs/hppa/hppa1.1/stage3.spec
similarity index 79%
rename from releases/weekly/specs/hppa/hppa1.1/stage3.spec
rename to releases/specs/hppa/hppa1.1/stage3.spec
index 53d4725f..aa49a0df 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage3.spec
+++ b/releases/specs/hppa/hppa1.1/stage3.spec
@@ -5,5 +5,5 @@ rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-hppa1.1-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1

diff --git a/releases/weekly/specs/hppa/hppa2.0/stage1.spec b/releases/specs/hppa/hppa2.0/stage1.spec
similarity index 80%
rename from releases/weekly/specs/hppa/hppa2.0/stage1.spec
rename to releases/specs/hppa/hppa2.0/stage1.spec
index 7a908f4a..01e8f0d5 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage1.spec
+++ b/releases/specs/hppa/hppa2.0/stage1.spec
@@ -6,5 +6,5 @@ profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage3-hppa2.0-latest
 update_seed: yes
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0

diff --git a/releases/weekly/specs/hppa/hppa2.0/stage2.spec b/releases/specs/hppa/hppa2.0/stage2.spec
similarity index 79%
rename from releases/weekly/specs/hppa/hppa2.0/stage2.spec
rename to releases/specs/hppa/hppa2.0/stage2.spec
index 812a8d7e..479dd27c 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage2.spec
+++ b/releases/specs/hppa/hppa2.0/stage2.spec
@@ -5,5 +5,5 @@ rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-hppa2.0-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa2.0

diff --git a/releases/weekly/specs/hppa/hppa2.0/stage3.spec b/releases/specs/hppa/hppa2.0/stage3.spec
similarity index 79%
rename from releases/weekly/specs/hppa/hppa2.0/stage3.spec
rename to releases/specs/hppa/hppa2.0/stage3.spec
index 780fdb56..cbdce72b 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage3.spec
+++ b/releases/specs/hppa/hppa2.0/stage3.spec
@@ -5,5 +5,5 @@ rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: 2008.0
 source_subpath: default/stage1-hppa2.0-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0

diff --git a/releases/weekly/specs/hppa/installcd-stage1.spec b/releases/specs/hppa/installcd-stage1.spec
similarity index 95%
rename from releases/weekly/specs/hppa/installcd-stage1.spec
rename to releases/specs/hppa/installcd-stage1.spec
index 2938d3fa..2b609b90 100644
--- a/releases/weekly/specs/hppa/installcd-stage1.spec
+++ b/releases/specs/hppa/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/hppa/17.0
 snapshot: 20140201
 source_subpath: default/stage3-hppa1.1-20140201
 pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage1
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 livecd/use:
 	-*
 	python_targets_python3_6

diff --git a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec
similarity index 99%
rename from releases/weekly/specs/hppa/installcd-stage2-minimal.spec
rename to releases/specs/hppa/installcd-stage2-minimal.spec
index aa6e7bb2..3abace12 100644
--- a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
+++ b/releases/specs/hppa/installcd-stage2-minimal.spec
@@ -6,7 +6,7 @@ profile: default/linux/hppa/17.0
 snapshot: 20140201
 source_subpath: default/livecd-stage1-hppa1.1-20140201
 pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage2
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/volid: Gentoo hppa latest
 livecd/bootargs: dokeymap

diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/specs/hppa/installcd-stage2-universal.spec
similarity index 100%
rename from releases/weekly/specs/hppa/installcd-stage2-universal.spec
rename to releases/specs/hppa/installcd-stage2-universal.spec

diff --git a/releases/weekly/specs/hppa/netboot2-hppa32.spec b/releases/specs/hppa/netboot2-hppa32.spec
similarity index 97%
rename from releases/weekly/specs/hppa/netboot2-hppa32.spec
rename to releases/specs/hppa/netboot2-hppa32.spec
index b2e87aac..f1f73591 100644
--- a/releases/weekly/specs/hppa/netboot2-hppa32.spec
+++ b/releases/specs/hppa/netboot2-hppa32.spec
@@ -13,7 +13,7 @@ profile:         default/linux/hppa/17.0
 # netboot2 stuff
 boot/kernel:                      netboot32
 boot/kernel/netboot32/sources:       sys-kernel/gentoo-sources
-boot/kernel/netboot32/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
+boot/kernel/netboot32/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
 boot/kernel/netboot32/gk_kernargs:   --all-ramdisk-modules
 
 netboot2/use:

diff --git a/releases/weekly/specs/hppa/netboot2-hppa64.spec b/releases/specs/hppa/netboot2-hppa64.spec
similarity index 97%
rename from releases/weekly/specs/hppa/netboot2-hppa64.spec
rename to releases/specs/hppa/netboot2-hppa64.spec
index acaae4e0..529ab6a5 100644
--- a/releases/weekly/specs/hppa/netboot2-hppa64.spec
+++ b/releases/specs/hppa/netboot2-hppa64.spec
@@ -12,7 +12,7 @@ profile:         default/linux/hppa/17.0
 
 boot/kernel:                      netboot64
 boot/kernel/netboot64/sources:       sys-kernel/gentoo-sources
-boot/kernel/netboot64/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
+boot/kernel/netboot64/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
 boot/kernel/netboot64/gk_kernargs:   --cross-compile=hppa64-unknown-linux-gnu --all-ramdisk-modules
 
 netboot2/use:

diff --git a/releases/weekly/specs/ia64/installcd-stage1.spec b/releases/specs/ia64/installcd-stage1.spec
similarity index 97%
rename from releases/weekly/specs/ia64/installcd-stage1.spec
rename to releases/specs/ia64/installcd-stage1.spec
index 688f03f9..fc6f1997 100644
--- a/releases/weekly/specs/ia64/installcd-stage1.spec
+++ b/releases/specs/ia64/installcd-stage1.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: default/stage3-ia64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	compile-locales

diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/specs/ia64/installcd-stage2-minimal.spec
similarity index 99%
rename from releases/weekly/specs/ia64/installcd-stage2-minimal.spec
rename to releases/specs/ia64/installcd-stage2-minimal.spec
index 0ec44e11..fb6c99bb 100644
--- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
+++ b/releases/specs/ia64/installcd-stage2-minimal.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: default/livecd-stage1-ia64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs

diff --git a/releases/weekly/specs/ia64/stage1.spec b/releases/specs/ia64/stage1.spec
similarity index 84%
rename from releases/weekly/specs/ia64/stage1.spec
rename to releases/specs/ia64/stage1.spec
index c44e8fb9..d3d4a319 100644
--- a/releases/weekly/specs/ia64/stage1.spec
+++ b/releases/specs/ia64/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/ia64/stage2.spec b/releases/specs/ia64/stage2.spec
similarity index 81%
rename from releases/weekly/specs/ia64/stage2.spec
rename to releases/specs/ia64/stage2.spec
index 3e9ed6df..c533701b 100644
--- a/releases/weekly/specs/ia64/stage2.spec
+++ b/releases/specs/ia64/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-ia64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/ia64/stage3.spec b/releases/specs/ia64/stage3.spec
similarity index 81%
rename from releases/weekly/specs/ia64/stage3.spec
rename to releases/specs/ia64/stage3.spec
index b8c457fc..c4ebd808 100644
--- a/releases/weekly/specs/ia64/stage3.spec
+++ b/releases/specs/ia64/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-ia64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/mips/mips3/netboot.spec b/releases/specs/mips/mips3/netboot.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips3/netboot.spec
rename to releases/specs/mips/mips3/netboot.spec

diff --git a/releases/weekly/specs/mips/mips3/stage1.spec b/releases/specs/mips/mips3/stage1.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips3/stage1.spec
rename to releases/specs/mips/mips3/stage1.spec

diff --git a/releases/weekly/specs/mips/mips3/stage2.spec b/releases/specs/mips/mips3/stage2.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips3/stage2.spec
rename to releases/specs/mips/mips3/stage2.spec

diff --git a/releases/weekly/specs/mips/mips3/stage3.spec b/releases/specs/mips/mips3/stage3.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips3/stage3.spec
rename to releases/specs/mips/mips3/stage3.spec

diff --git a/releases/weekly/specs/mips/mips4/stage1.spec b/releases/specs/mips/mips4/stage1.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips4/stage1.spec
rename to releases/specs/mips/mips4/stage1.spec

diff --git a/releases/weekly/specs/mips/mips4/stage2.spec b/releases/specs/mips/mips4/stage2.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips4/stage2.spec
rename to releases/specs/mips/mips4/stage2.spec

diff --git a/releases/weekly/specs/mips/mips4/stage3.spec b/releases/specs/mips/mips4/stage3.spec
similarity index 100%
rename from releases/weekly/specs/mips/mips4/stage3.spec
rename to releases/specs/mips/mips4/stage3.spec

diff --git a/releases/weekly/specs/ppc/ppc32/g4/stage2.spec b/releases/specs/ppc/ppc32/g4/stage2.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/g4/stage2.spec
rename to releases/specs/ppc/ppc32/g4/stage2.spec

diff --git a/releases/weekly/specs/ppc/ppc32/g4/stage3.spec b/releases/specs/ppc/ppc32/g4/stage3.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/g4/stage3.spec
rename to releases/specs/ppc/ppc32/g4/stage3.spec

diff --git a/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec
similarity index 96%
rename from releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
rename to releases/specs/ppc/ppc32/installcd-stage1.spec
index ec8b427f..d11c0790 100644
--- a/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
+++ b/releases/specs/ppc/ppc32/installcd-stage1.spec
@@ -7,7 +7,7 @@ snapshot: 2008.0
 source_subpath: default/stage3-ppc-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	compile-locales

diff --git a/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
similarity index 99%
rename from releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
rename to releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
index 862647d6..f219c413 100644
--- a/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
+++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/powerpc/ppc32/17.0
 snapshot: 2008.0
 source_subpath: default/livecd-stage1-ppc-2008.0
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/fstype: squashfs 
 livecd/gk_mainargs: --makeopts=-j12

diff --git a/releases/weekly/specs/ppc/ppc32/stage1.spec b/releases/specs/ppc/ppc32/stage1.spec
similarity index 85%
rename from releases/weekly/specs/ppc/ppc32/stage1.spec
rename to releases/specs/ppc/ppc32/stage1.spec
index 227d2ecb..d4192502 100644
--- a/releases/weekly/specs/ppc/ppc32/stage1.spec
+++ b/releases/specs/ppc/ppc32/stage1.spec
@@ -9,4 +9,4 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world --jobs 5 --load-average 5
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc32/stage2.spec b/releases/specs/ppc/ppc32/stage2.spec
similarity index 80%
rename from releases/weekly/specs/ppc/ppc32/stage2.spec
rename to releases/specs/ppc/ppc32/stage2.spec
index 0ffbe4b6..9640b66e 100644
--- a/releases/weekly/specs/ppc/ppc32/stage2.spec
+++ b/releases/specs/ppc/ppc32/stage2.spec
@@ -7,4 +7,4 @@ snapshot: 2008.0
 source_subpath: default/stage1-ppc-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc32/stage3.spec b/releases/specs/ppc/ppc32/stage3.spec
similarity index 80%
rename from releases/weekly/specs/ppc/ppc32/stage3.spec
rename to releases/specs/ppc/ppc32/stage3.spec
index 567a675c..13b01082 100644
--- a/releases/weekly/specs/ppc/ppc32/stage3.spec
+++ b/releases/specs/ppc/ppc32/stage3.spec
@@ -7,4 +7,4 @@ snapshot: 2008.0
 source_subpath: default/stage1-ppc-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage1.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage1.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage1.spec
rename to releases/specs/ppc/ppc32/uclibc/hardened/stage1.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage2.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage2.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage2.spec
rename to releases/specs/ppc/ppc32/uclibc/hardened/stage2.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage3.spec b/releases/specs/ppc/ppc32/uclibc/hardened/stage3.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/hardened/stage3.spec
rename to releases/specs/ppc/ppc32/uclibc/hardened/stage3.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage1.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage1.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage1.spec
rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage1.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage2.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage2.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage2.spec
rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage2.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage3.spec b/releases/specs/ppc/ppc32/uclibc/softfloat/stage3.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/softfloat/stage3.spec
rename to releases/specs/ppc/ppc32/uclibc/softfloat/stage3.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage1.spec b/releases/specs/ppc/ppc32/uclibc/stage1.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/stage1.spec
rename to releases/specs/ppc/ppc32/uclibc/stage1.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage2.spec b/releases/specs/ppc/ppc32/uclibc/stage2.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/stage2.spec
rename to releases/specs/ppc/ppc32/uclibc/stage2.spec

diff --git a/releases/weekly/specs/ppc/ppc32/uclibc/stage3.spec b/releases/specs/ppc/ppc32/uclibc/stage3.spec
similarity index 100%
rename from releases/weekly/specs/ppc/ppc32/uclibc/stage3.spec
rename to releases/specs/ppc/ppc32/uclibc/stage3.spec

diff --git a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec b/releases/specs/ppc/ppc64/stage1-32ul.spec
similarity index 87%
rename from releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
rename to releases/specs/ppc/ppc64/stage1-32ul.spec
index 49cc2cc2..fbbb9a28 100644
--- a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
+++ b/releases/specs/ppc/ppc64/stage1-32ul.spec
@@ -10,4 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world --jobs 5 --load-average 5
 chost: powerpc-unknown-linux-gnu
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64/stage1.spec b/releases/specs/ppc/ppc64/stage1.spec
similarity index 85%
rename from releases/weekly/specs/ppc/ppc64/stage1.spec
rename to releases/specs/ppc/ppc64/stage1.spec
index a727fe7e..dfac6d1b 100644
--- a/releases/weekly/specs/ppc/ppc64/stage1.spec
+++ b/releases/specs/ppc/ppc64/stage1.spec
@@ -9,4 +9,4 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world --jobs 5 --load-average 5
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec b/releases/specs/ppc/ppc64/stage2-32ul.spec
similarity index 84%
rename from releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
rename to releases/specs/ppc/ppc64/stage2-32ul.spec
index ebe47d89..871fd498 100644
--- a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
+++ b/releases/specs/ppc/ppc64/stage2-32ul.spec
@@ -8,4 +8,4 @@ source_subpath: default/stage1-ppc64-32ul-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 chost: powerpc-unknown-linux-gnu
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64/stage2.spec b/releases/specs/ppc/ppc64/stage2.spec
similarity index 82%
rename from releases/weekly/specs/ppc/ppc64/stage2.spec
rename to releases/specs/ppc/ppc64/stage2.spec
index dc5b9dc5..0452729f 100644
--- a/releases/weekly/specs/ppc/ppc64/stage2.spec
+++ b/releases/specs/ppc/ppc64/stage2.spec
@@ -7,4 +7,4 @@ snapshot: 2008.0
 source_subpath: default/stage1-ppc64-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec b/releases/specs/ppc/ppc64/stage3-32ul.spec
similarity index 82%
rename from releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
rename to releases/specs/ppc/ppc64/stage3-32ul.spec
index cbd241ec..d5ac2811 100644
--- a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
+++ b/releases/specs/ppc/ppc64/stage3-32ul.spec
@@ -7,4 +7,4 @@ snapshot: 2008.0
 source_subpath: default/stage1-ppc64-32ul-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64/stage3.spec b/releases/specs/ppc/ppc64/stage3.spec
similarity index 82%
rename from releases/weekly/specs/ppc/ppc64/stage3.spec
rename to releases/specs/ppc/ppc64/stage3.spec
index 6dad59ac..f0f1eef0 100644
--- a/releases/weekly/specs/ppc/ppc64/stage3.spec
+++ b/releases/specs/ppc/ppc64/stage3.spec
@@ -7,4 +7,4 @@ snapshot: 2008.0
 source_subpath: default/stage1-ppc64-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64le/stage1.spec b/releases/specs/ppc/ppc64le/stage1.spec
similarity index 85%
rename from releases/weekly/specs/ppc/ppc64le/stage1.spec
rename to releases/specs/ppc/ppc64le/stage1.spec
index 0594f2d8..c6df1aa9 100644
--- a/releases/weekly/specs/ppc/ppc64le/stage1.spec
+++ b/releases/specs/ppc/ppc64le/stage1.spec
@@ -9,4 +9,4 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world --jobs 5 --load-average 5
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/ppc/ppc64le/stage3.spec b/releases/specs/ppc/ppc64le/stage3.spec
similarity index 81%
rename from releases/weekly/specs/ppc/ppc64le/stage3.spec
rename to releases/specs/ppc/ppc64le/stage3.spec
index 3af43553..99e075b3 100644
--- a/releases/weekly/specs/ppc/ppc64le/stage3.spec
+++ b/releases/specs/ppc/ppc64le/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-ppc64le-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages

diff --git a/releases/weekly/specs/s390/s390/netboot/misc/gentoo.exec b/releases/specs/s390/s390/netboot/misc/gentoo.exec
similarity index 100%
rename from releases/weekly/specs/s390/s390/netboot/misc/gentoo.exec
rename to releases/specs/s390/s390/netboot/misc/gentoo.exec

diff --git a/releases/weekly/specs/s390/s390/netboot/misc/gentoo.parmfile b/releases/specs/s390/s390/netboot/misc/gentoo.parmfile
similarity index 100%
rename from releases/weekly/specs/s390/s390/netboot/misc/gentoo.parmfile
rename to releases/specs/s390/s390/netboot/misc/gentoo.parmfile

diff --git a/releases/weekly/specs/s390/s390/netboot/netboot.spec b/releases/specs/s390/s390/netboot/netboot.spec
similarity index 98%
rename from releases/weekly/specs/s390/s390/netboot/netboot.spec
rename to releases/specs/s390/s390/netboot/netboot.spec
index e262711d..f7970a01 100644
--- a/releases/weekly/specs/s390/s390/netboot/netboot.spec
+++ b/releases/specs/s390/s390/netboot/netboot.spec
@@ -9,7 +9,7 @@ target:          netboot2
 subarch:         s390
 rel_type:        default
 profile:         default/linux/s390/17.0
-portage_confdir: @REPO_DIR@/releases/weekly/specs/s390/s390/netboot/portage
+portage_confdir: @REPO_DIR@/releases/specs/s390/s390/netboot/portage
 
 
 boot/kernel:                      netboot

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
similarity index 100%
rename from releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources
rename to releases/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources

diff --git a/releases/weekly/specs/s390/s390/netboot/portage/package.use/genkernel b/releases/specs/s390/s390/netboot/portage/package.use/genkernel
similarity index 100%
rename from releases/weekly/specs/s390/s390/netboot/portage/package.use/genkernel
rename to releases/specs/s390/s390/netboot/portage/package.use/genkernel

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
similarity index 100%
rename from releases/weekly/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch
rename to releases/specs/s390/s390/netboot/portage/patches/sys-kernel/genkernel/s390.patch

diff --git a/releases/weekly/specs/s390/s390/stage1.spec b/releases/specs/s390/s390/stage1.spec
similarity index 86%
rename from releases/weekly/specs/s390/s390/stage1.spec
rename to releases/specs/s390/s390/stage1.spec
index 41637d54..9f6daefe 100644
--- a/releases/weekly/specs/s390/s390/stage1.spec
+++ b/releases/specs/s390/s390/stage1.spec
@@ -9,5 +9,5 @@ update_seed: yes
 update_seed_command: --update --deep @world --jobs 2 --load-average 2
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390

diff --git a/releases/weekly/specs/s390/s390/stage2.spec b/releases/specs/s390/s390/stage2.spec
similarity index 83%
rename from releases/weekly/specs/s390/s390/stage2.spec
rename to releases/specs/s390/s390/stage2.spec
index 01cc2a15..45054936 100644
--- a/releases/weekly/specs/s390/s390/stage2.spec
+++ b/releases/specs/s390/s390/stage2.spec
@@ -7,5 +7,5 @@ snapshot: 2008.0
 source_subpath: default/stage1-s390-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-s390

diff --git a/releases/weekly/specs/s390/s390/stage3.spec b/releases/specs/s390/s390/stage3.spec
similarity index 83%
rename from releases/weekly/specs/s390/s390/stage3.spec
rename to releases/specs/s390/s390/stage3.spec
index cac20044..61aeb976 100644
--- a/releases/weekly/specs/s390/s390/stage3.spec
+++ b/releases/specs/s390/s390/stage3.spec
@@ -7,5 +7,5 @@ snapshot: 2008.0
 source_subpath: default/stage1-s390-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390

diff --git a/releases/weekly/specs/s390/s390x/netboot/misc/gentoo.exec b/releases/specs/s390/s390x/netboot/misc/gentoo.exec
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/misc/gentoo.exec
rename to releases/specs/s390/s390x/netboot/misc/gentoo.exec

diff --git a/releases/weekly/specs/s390/s390x/netboot/misc/gentoo.parmfile b/releases/specs/s390/s390x/netboot/misc/gentoo.parmfile
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/misc/gentoo.parmfile
rename to releases/specs/s390/s390x/netboot/misc/gentoo.parmfile

diff --git a/releases/weekly/specs/s390/s390x/netboot/netboot.spec b/releases/specs/s390/s390x/netboot/netboot.spec
similarity index 98%
rename from releases/weekly/specs/s390/s390x/netboot/netboot.spec
rename to releases/specs/s390/s390x/netboot/netboot.spec
index 4f578ab5..7c5936f4 100644
--- a/releases/weekly/specs/s390/s390x/netboot/netboot.spec
+++ b/releases/specs/s390/s390x/netboot/netboot.spec
@@ -9,7 +9,7 @@ target:          netboot2
 subarch:         s390x
 rel_type:        default
 profile:         default/linux/s390/17.0/s390x
-portage_confdir: @REPO_DIR@/releases/weekly/specs/s390/s390x/netboot/portage
+portage_confdir: @REPO_DIR@/releases/specs/s390/s390x/netboot/portage
 
 
 boot/kernel:                      netboot64

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
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources
rename to releases/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources

diff --git a/releases/weekly/specs/s390/s390x/netboot/portage/package.use/genkernel b/releases/specs/s390/s390x/netboot/portage/package.use/genkernel
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/portage/package.use/genkernel
rename to releases/specs/s390/s390x/netboot/portage/package.use/genkernel

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
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch
rename to releases/specs/s390/s390x/netboot/portage/patches/sys-kernel/genkernel/s390.patch

diff --git a/releases/weekly/specs/s390/s390x/stage1.spec b/releases/specs/s390/s390x/stage1.spec
similarity index 87%
rename from releases/weekly/specs/s390/s390x/stage1.spec
rename to releases/specs/s390/s390x/stage1.spec
index 98c5a353..207b4682 100644
--- a/releases/weekly/specs/s390/s390x/stage1.spec
+++ b/releases/specs/s390/s390x/stage1.spec
@@ -9,5 +9,5 @@ update_seed: yes
 update_seed_command: --update --deep @world --jobs 2 --load-average 2
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390x

diff --git a/releases/weekly/specs/s390/s390x/stage2.spec b/releases/specs/s390/s390x/stage2.spec
similarity index 84%
rename from releases/weekly/specs/s390/s390x/stage2.spec
rename to releases/specs/s390/s390x/stage2.spec
index e92cec56..298ea47c 100644
--- a/releases/weekly/specs/s390/s390x/stage2.spec
+++ b/releases/specs/s390/s390x/stage2.spec
@@ -7,5 +7,5 @@ snapshot: 2008.0
 source_subpath: default/stage1-s390x-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage2-s390x

diff --git a/releases/weekly/specs/s390/s390x/stage3.spec b/releases/specs/s390/s390x/stage3.spec
similarity index 84%
rename from releases/weekly/specs/s390/s390x/stage3.spec
rename to releases/specs/s390/s390x/stage3.spec
index ff34ed10..e655b52c 100644
--- a/releases/weekly/specs/s390/s390x/stage3.spec
+++ b/releases/specs/s390/s390x/stage3.spec
@@ -7,5 +7,5 @@ snapshot: 2008.0
 source_subpath: default/stage1-s390x-2008.0
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x

diff --git a/releases/weekly/specs/sh/sh4/stage1.spec b/releases/specs/sh/sh4/stage1.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4/stage1.spec
rename to releases/specs/sh/sh4/stage1.spec

diff --git a/releases/weekly/specs/sh/sh4/stage2.spec b/releases/specs/sh/sh4/stage2.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4/stage2.spec
rename to releases/specs/sh/sh4/stage2.spec

diff --git a/releases/weekly/specs/sh/sh4/stage3.spec b/releases/specs/sh/sh4/stage3.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4/stage3.spec
rename to releases/specs/sh/sh4/stage3.spec

diff --git a/releases/weekly/specs/sh/sh4a/stage1.spec b/releases/specs/sh/sh4a/stage1.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4a/stage1.spec
rename to releases/specs/sh/sh4a/stage1.spec

diff --git a/releases/weekly/specs/sh/sh4a/stage2.spec b/releases/specs/sh/sh4a/stage2.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4a/stage2.spec
rename to releases/specs/sh/sh4a/stage2.spec

diff --git a/releases/weekly/specs/sh/sh4a/stage3.spec b/releases/specs/sh/sh4a/stage3.spec
similarity index 100%
rename from releases/weekly/specs/sh/sh4a/stage3.spec
rename to releases/specs/sh/sh4a/stage3.spec

diff --git a/releases/weekly/specs/sparc/sparc/stage1.spec b/releases/specs/sparc/sparc/stage1.spec
similarity index 84%
rename from releases/weekly/specs/sparc/sparc/stage1.spec
rename to releases/specs/sparc/sparc/stage1.spec
index 118f2c10..0f9c12ad 100644
--- a/releases/weekly/specs/sparc/sparc/stage1.spec
+++ b/releases/specs/sparc/sparc/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc/stage2.spec b/releases/specs/sparc/sparc/stage2.spec
similarity index 82%
rename from releases/weekly/specs/sparc/sparc/stage2.spec
rename to releases/specs/sparc/sparc/stage2.spec
index 0aee1eed..00fe33c0 100644
--- a/releases/weekly/specs/sparc/sparc/stage2.spec
+++ b/releases/specs/sparc/sparc/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc/stage3.spec b/releases/specs/sparc/sparc/stage3.spec
similarity index 82%
rename from releases/weekly/specs/sparc/sparc/stage3.spec
rename to releases/specs/sparc/sparc/stage3.spec
index b96dbadc..6d08344a 100644
--- a/releases/weekly/specs/sparc/sparc/stage3.spec
+++ b/releases/specs/sparc/sparc/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage1.spec b/releases/specs/sparc/sparc/systemd-stage1.spec
similarity index 85%
rename from releases/weekly/specs/sparc/sparc/systemd-stage1.spec
rename to releases/specs/sparc/sparc/systemd-stage1.spec
index addba4d1..7bdb63dd 100644
--- a/releases/weekly/specs/sparc/sparc/systemd-stage1.spec
+++ b/releases/specs/sparc/sparc/systemd-stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage2.spec b/releases/specs/sparc/sparc/systemd-stage2.spec
similarity index 83%
rename from releases/weekly/specs/sparc/sparc/systemd-stage2.spec
rename to releases/specs/sparc/sparc/systemd-stage2.spec
index 81cfc480..1ec28640 100644
--- a/releases/weekly/specs/sparc/sparc/systemd-stage2.spec
+++ b/releases/specs/sparc/sparc/systemd-stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc-systemd-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc/systemd-stage3.spec b/releases/specs/sparc/sparc/systemd-stage3.spec
similarity index 83%
rename from releases/weekly/specs/sparc/sparc/systemd-stage3.spec
rename to releases/specs/sparc/sparc/systemd-stage3.spec
index 8d0e15df..df9d9c3a 100644
--- a/releases/weekly/specs/sparc/sparc/systemd-stage3.spec
+++ b/releases/specs/sparc/sparc/systemd-stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc-systemd-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec b/releases/specs/sparc/sparc64/installcd-stage1.spec
similarity index 96%
rename from releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
rename to releases/specs/sparc/sparc64/installcd-stage1.spec
index fe8954a4..9d4aa5a7 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/sparc/17.0/64ul
 snapshot: latest
 source_subpath: default/stage3-sparc64-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	compile-locales

diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
similarity index 97%
rename from releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
rename to releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
index 39f7c2a8..e8d4d71c 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/sparc/17.0/64ul
 snapshot: latest
 source_subpath: default/livecd-stage1-sparc64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs
@@ -17,7 +17,7 @@ livecd/gk_mainargs: --firmware-files=ql2200_fw.bin --makeopts=-j256
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/sparc/installcd-4.19.44.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/sparc/installcd-4.19.44.config
 
 livecd/unmerge:
 	app-admin/eselect

diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec b/releases/specs/sparc/sparc64/multilib/stage1.spec
similarity index 100%
rename from releases/weekly/specs/sparc/sparc64/multilib/stage1.spec
rename to releases/specs/sparc/sparc64/multilib/stage1.spec

diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage2.spec b/releases/specs/sparc/sparc64/multilib/stage2.spec
similarity index 100%
rename from releases/weekly/specs/sparc/sparc64/multilib/stage2.spec
rename to releases/specs/sparc/sparc64/multilib/stage2.spec

diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec b/releases/specs/sparc/sparc64/multilib/stage3.spec
similarity index 100%
rename from releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
rename to releases/specs/sparc/sparc64/multilib/stage3.spec

diff --git a/releases/weekly/specs/sparc/sparc64/netboot.spec b/releases/specs/sparc/sparc64/netboot.spec
similarity index 100%
rename from releases/weekly/specs/sparc/sparc64/netboot.spec
rename to releases/specs/sparc/sparc64/netboot.spec

diff --git a/releases/weekly/specs/sparc/sparc64/stage1.spec b/releases/specs/sparc/sparc64/stage1.spec
similarity index 85%
rename from releases/weekly/specs/sparc/sparc64/stage1.spec
rename to releases/specs/sparc/sparc64/stage1.spec
index 0f4a4934..b14dcac9 100644
--- a/releases/weekly/specs/sparc/sparc64/stage1.spec
+++ b/releases/specs/sparc/sparc64/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/stage2.spec b/releases/specs/sparc/sparc64/stage2.spec
similarity index 82%
rename from releases/weekly/specs/sparc/sparc64/stage2.spec
rename to releases/specs/sparc/sparc64/stage2.spec
index c492f2cb..17aee7fb 100644
--- a/releases/weekly/specs/sparc/sparc64/stage2.spec
+++ b/releases/specs/sparc/sparc64/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/stage3.spec b/releases/specs/sparc/sparc64/stage3.spec
similarity index 82%
rename from releases/weekly/specs/sparc/sparc64/stage3.spec
rename to releases/specs/sparc/sparc64/stage3.spec
index 371f3e9f..bc2375fd 100644
--- a/releases/weekly/specs/sparc/sparc64/stage3.spec
+++ b/releases/specs/sparc/sparc64/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage1.spec b/releases/specs/sparc/sparc64/systemd-stage1.spec
similarity index 86%
rename from releases/weekly/specs/sparc/sparc64/systemd-stage1.spec
rename to releases/specs/sparc/sparc64/systemd-stage1.spec
index 7a96a8a8..bf141f8c 100644
--- a/releases/weekly/specs/sparc/sparc64/systemd-stage1.spec
+++ b/releases/specs/sparc/sparc64/systemd-stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage2.spec b/releases/specs/sparc/sparc64/systemd-stage2.spec
similarity index 83%
rename from releases/weekly/specs/sparc/sparc64/systemd-stage2.spec
rename to releases/specs/sparc/sparc64/systemd-stage2.spec
index a9787ae5..98e55a41 100644
--- a/releases/weekly/specs/sparc/sparc64/systemd-stage2.spec
+++ b/releases/specs/sparc/sparc64/systemd-stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc64-systemd-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/sparc/sparc64/systemd-stage3.spec b/releases/specs/sparc/sparc64/systemd-stage3.spec
similarity index 83%
rename from releases/weekly/specs/sparc/sparc64/systemd-stage3.spec
rename to releases/specs/sparc/sparc64/systemd-stage3.spec
index 60809a18..8ac65f07 100644
--- a/releases/weekly/specs/sparc/sparc64/systemd-stage3.spec
+++ b/releases/specs/sparc/sparc64/systemd-stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-sparc64-systemd-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/specs/x86/hardened/admincd-stage1.spec
similarity index 98%
rename from releases/weekly/specs/x86/hardened/admincd-stage1.spec
rename to releases/specs/x86/hardened/admincd-stage1.spec
index 048ece96..661ca1c1 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
+++ b/releases/specs/x86/hardened/admincd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/x86/17.0/hardened
 snapshot: latest
 source_subpath: hardened/stage3-i686-hardened-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	alsa

diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/specs/x86/hardened/admincd-stage2.spec
similarity index 96%
rename from releases/weekly/specs/x86/hardened/admincd-stage2.spec
rename to releases/specs/x86/hardened/admincd-stage2.spec
index b23d8d24..836ebc14 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/specs/x86/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: default/linux/x86/17.0/hardened
 snapshot: latest
 source_subpath: hardened/livecd-stage1-i686-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs
@@ -16,7 +16,7 @@ livecd/volid: Gentoo x86 AdminCD latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/admincd-3.18.9.config
 
 livecd/unmerge:
 	app-admin/eselect

diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/specs/x86/hardened/installcd-stage1.spec
similarity index 100%
rename from releases/weekly/specs/x86/hardened/installcd-stage1.spec
rename to releases/specs/x86/hardened/installcd-stage1.spec

diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/specs/x86/hardened/installcd-stage2-minimal.spec
similarity index 98%
rename from releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
rename to releases/specs/x86/hardened/installcd-stage2-minimal.spec
index 66dd7dbb..c3107b40 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
+++ b/releases/specs/x86/hardened/installcd-stage2-minimal.spec
@@ -16,7 +16,7 @@ livecd/volid: Gentoo x86 latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/hardened/installcd-2.6.38.config
 boot/kernel/gentoo/use:
 	-*
 	alsa

diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/specs/x86/hardened/stage1.spec
similarity index 85%
rename from releases/weekly/specs/x86/hardened/stage1.spec
rename to releases/specs/x86/hardened/stage1.spec
index 5bc5e845..4e56276a 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/specs/x86/hardened/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/specs/x86/hardened/stage2.spec
similarity index 83%
rename from releases/weekly/specs/x86/hardened/stage2.spec
rename to releases/specs/x86/hardened/stage2.spec
index 1de92054..c294c7f0 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/specs/x86/hardened/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage1-i686-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/specs/x86/hardened/stage3.spec
similarity index 83%
rename from releases/weekly/specs/x86/hardened/stage3.spec
rename to releases/specs/x86/hardened/stage3.spec
index b83a849e..3d0e03cf 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/specs/x86/hardened/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: hardened/stage2-i686-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/i686/hardened/stage2.spec b/releases/specs/x86/i686/hardened/stage2.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/hardened/stage2.spec
rename to releases/specs/x86/i686/hardened/stage2.spec

diff --git a/releases/weekly/specs/x86/i686/hardened/stage3.spec b/releases/specs/x86/i686/hardened/stage3.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/hardened/stage3.spec
rename to releases/specs/x86/i686/hardened/stage3.spec

diff --git a/releases/weekly/specs/x86/i686/livecd-stage1.spec b/releases/specs/x86/i686/livecd-stage1.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/livecd-stage1.spec
rename to releases/specs/x86/i686/livecd-stage1.spec

diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/specs/x86/i686/livecd-stage2.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/livecd-stage2.spec
rename to releases/specs/x86/i686/livecd-stage2.spec

diff --git a/releases/weekly/specs/x86/i686/livedvd-stage1.spec b/releases/specs/x86/i686/livedvd-stage1.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/livedvd-stage1.spec
rename to releases/specs/x86/i686/livedvd-stage1.spec

diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/specs/x86/i686/livedvd-stage2.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/livedvd-stage2.spec
rename to releases/specs/x86/i686/livedvd-stage2.spec

diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/specs/x86/i686/stage1.spec
similarity index 84%
rename from releases/weekly/specs/x86/i686/stage1.spec
rename to releases/specs/x86/i686/stage1.spec
index cde76481..355a0c17 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/specs/x86/i686/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/i686/stage2-desktop.spec b/releases/specs/x86/i686/stage2-desktop.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/stage2-desktop.spec
rename to releases/specs/x86/i686/stage2-desktop.spec

diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/specs/x86/i686/stage2.spec
similarity index 81%
rename from releases/weekly/specs/x86/i686/stage2.spec
rename to releases/specs/x86/i686/stage2.spec
index 5fe221cf..edec3493 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/specs/x86/i686/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-i686-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/i686/stage3-desktop.spec b/releases/specs/x86/i686/stage3-desktop.spec
similarity index 100%
rename from releases/weekly/specs/x86/i686/stage3-desktop.spec
rename to releases/specs/x86/i686/stage3-desktop.spec

diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/specs/x86/i686/stage3.spec
similarity index 81%
rename from releases/weekly/specs/x86/i686/stage3.spec
rename to releases/specs/x86/i686/stage3.spec
index eb536dfa..58c55ff2 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/specs/x86/i686/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage2-i686-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/specs/x86/installcd-stage1.spec
similarity index 96%
rename from releases/weekly/specs/x86/installcd-stage1.spec
rename to releases/specs/x86/installcd-stage1.spec
index de8fdf98..3cfeba20 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/specs/x86/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/x86/17.0
 snapshot: latest
 source_subpath: default/stage3-i486-latest
 compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/use:
 	alsa

diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/specs/x86/installcd-stage2-minimal.spec
similarity index 96%
rename from releases/weekly/specs/x86/installcd-stage2-minimal.spec
rename to releases/specs/x86/installcd-stage2-minimal.spec
index e5afaf13..bb171e33 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/specs/x86/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/x86/17.0
 snapshot: latest
 source_subpath: default/livecd-stage1-i486-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 #livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -17,7 +17,7 @@ livecd/volid: Gentoo x86 latest
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/installcd-4.14.52.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/installcd-4.14.52.config
 
 livecd/unmerge:
 	app-admin/eselect

diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/specs/x86/stage1.spec
similarity index 84%
rename from releases/weekly/specs/x86/stage1.spec
rename to releases/specs/x86/stage1.spec
index 22289aeb..be0bb437 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/specs/x86/stage1.spec
@@ -9,5 +9,5 @@ compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/specs/x86/stage2.spec
similarity index 81%
rename from releases/weekly/specs/x86/stage2.spec
rename to releases/specs/x86/stage2.spec
index 2cef628b..6c060867 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/specs/x86/stage2.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage1-i486-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/specs/x86/stage3.spec
similarity index 81%
rename from releases/weekly/specs/x86/stage3.spec
rename to releases/specs/x86/stage3.spec
index 6f40346a..046f6543 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/specs/x86/stage3.spec
@@ -7,5 +7,5 @@ snapshot: latest
 source_subpath: default/stage2-i486-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index 8d1bf8ea..8d54a3a0 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -43,7 +43,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/../releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --no-nfs --makeopts=-j4
 

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index 1ca4f029..6548d5a8 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -29,7 +29,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
 stage4/rcadd:
 	acpid|default
 	net.lo|default
@@ -38,7 +38,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index c8090e97..27825851 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/alpha
+SPECS_DIR=${REPO_DIR}/releases/specs/alpha
  
 SPECS="stage1.spec stage3.spec"
 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -16,7 +16,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage3.spec"
 SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/alpha
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
 
 update_symlinks() {
 	# Symlink the latest stages3 to build from

diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 5e444764..b78f3d23 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -7,7 +7,7 @@ host=$(hostname)
 
 source /etc/catalyst/release/build.env
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
 
 SETS="
 	multilib minimal_multilib
@@ -36,7 +36,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
 SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
 SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
 
 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
 

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 31cb48b0..57f080aa 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -7,7 +7,7 @@ host=$(hostname)
 
 source /etc/catalyst/release/build.env
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
 
 SETS="
 	multilib minimal_multilib
@@ -37,7 +37,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
 #SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
 SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
 
 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
 

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 15a4a0c4..774dc265 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm64
+SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 0727b830..e09b6cb8 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv4tl
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv4tl
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 9956a033..8daef964 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv5tel
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv5tel
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 97406f65..a1d52f5d 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv6j
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 6f26e2fa..50bf09f7 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv6j/hardfloat
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j/hardfloat
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 0e7a6126..a4def3c7 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv7a
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index e9c893d2..ce7904a5 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -3,7 +3,7 @@
 
 REPO_DIR=/root/releng/
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/arm/armv7a/hardfloat
+SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a/hardfloat
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default"
@@ -11,7 +11,7 @@ SETS="default"
 SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
 #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 850cf411..967985b6 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/hppa
+SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
 SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
 
@@ -13,7 +13,7 @@ SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_hppa_netboot_SPECS="netboot2-hppa32.spec netboot2-hppa64.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/hppa
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
 
 EMAIL_SUBJECT_PREPEND="[hppa-auto]"
 

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index e441cfc8..0bc6e0af 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ia64
+SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 
 SPECS="stage1.spec stage3.spec"
 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -10,7 +10,7 @@ SPECS="stage1.spec stage3.spec"
 
 OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/ia64
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
 
 update_symlinks() {
 	# Symlink the latest stages3 to build from

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 1ff04bd0..4935739a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc
+SPECS_DIR=${REPO_DIR}/releases/specs/ppc
  
 SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -10,7 +10,7 @@ SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
  
 OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
  
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
  
 EMAIL_SUBJECT_PREPEND="[ppc-auto]"
 

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index acfcdfec..bb6e2852 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64le
+SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
 SPECS="stage1.spec stage3.spec"
 
@@ -11,7 +11,7 @@ SPECS="stage1.spec stage3.spec"
  
 #OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
  
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
  
 EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
 

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 4986c053..ed84923a 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/s390/s390
+SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default netboot"
@@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage3.spec"
 
 SET_netboot_SPECS="netboot/netboot.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
 update_symlinks() {
 	# Symlink the latest stages3 to build from

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index ab10f702..8bdb8993 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/s390/s390x
+SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
 SETS="default netboot"
@@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage3.spec"
 
 SET_netboot_SPECS="netboot/netboot.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
 update_symlinks() {
 	# Symlink the latest stages3 to build from

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 5e83a6bc..94723124 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,12 +1,12 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc
+SPECS_DIR=${REPO_DIR}/releases/specs/sparc
 
 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"
 OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
 
 EMAIL_SUBJECT_PREPEND="[sparc-auto]"
 

diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 673e00e9..da8c3df6 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -7,7 +7,7 @@ host=$(hostname)
 
 source /etc/catalyst/release/build.env
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
 
 SETS="
 	i486
@@ -23,7 +23,7 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
 
 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
 

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 0aa7990a..6d8ea027 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -7,7 +7,7 @@ host=$(hostname)
 
 source /etc/catalyst/release/build.env
 
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
 
 SETS="
 	i486
@@ -23,7 +23,7 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
 
 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2020-04-29 23:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-29 23:20 [gentoo-commits] proj/releng:master commit in: releases/overlays/common/overlay/livecd/snapshots/, Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox