Stop using hardcoded paths for the files in the releng repo.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

34 files changed, 55 insertions, 54 deletions

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index c1448c87..ef6fc560 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -6,7 +6,7 @@ profile: hardened/linux/amd64/selinux
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
 compression_mode: pixz_x
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/admincd
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index 7ff2e2cd..cafb2127 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -6,7 +6,7 @@ profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
 compression_mode: pixz_x
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/admincd
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index b64c4ef2..d8edb5f8 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: latest
 source_subpath: hardened/livecd-stage1-amd64-selinux-latest
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/admincd
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
 boot/kernel/gentoo/use:
 	-*
 	alsa
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 105a6649..d1a31279 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/livecd-stage1-amd64-latest
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/admincd
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/admincd-3.18.9.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.18.9.config
 boot/kernel/gentoo/use:
 	-*
 	alsa
diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
index f4345548..dd178dc3 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index deb8e9c8..a2922567 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
index a9ca896d..23e6639e 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
index 3a76b658..6d196e4d 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
index 29488769..4768ecc9 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index 648824bc..fa9614b9 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
index 18fd65c0..dd3d806d 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
index e4b948ab..9462e8c4 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: hardened/stage1-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
index c1ca94df..87f8e9f8 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index 5fef7533..735e62b7 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
index 3754db41..2d6f876e 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
@@ -7,4 +7,4 @@ 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: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
index 87fa109a..eebf6b90 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: hardened/stage2-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
index 94b82152..b7b08e64 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bash-completion
@@ -38,8 +38,8 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	sys-process/cronie
-stage4/fsscript: /home/release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /home/release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	cloud-config|default
@@ -55,7 +55,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
 
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
index 9d5d97e7..21c9be87 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bash-completion
@@ -38,8 +38,8 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	sys-process/cronie
-stage4/fsscript: /home/release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /home/release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	cloud-config|default
@@ -55,7 +55,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.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/weekly/specs/amd64/installcd-stage1.spec
index f2d15ba4..407cc7bd 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
 compression_mode: pixz_x
-portage_confdir: /home/release/releng/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/installcd
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index c299c5cc..4849a28c 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/livecd-stage1-amd64-latest
-portage_confdir: /home/release/releng/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/installcd
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/installcd-3.18.12.config
 boot/kernel/gentoo/use:
 	-*
 	alsa
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec
index 364f1e3d..5a22e60f 100644
--- a/releases/weekly/specs/amd64/livecd-stage2.spec
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livecd-amd64-installer-latest.iso
@@ -17,12 +17,12 @@ livecd/volid: Gentoo Linux latest amd64 LiveCD
 livecd/xsession: xfce
 livecd/xdm: gdm
 
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livecd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livecd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/amd64/livecd-2.6.24.config
 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
 boot/kernel/gentoo/packages:
 	media-libs/alsa-oss
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec
index 7b0fcc46..73b9337d 100644
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livedvd-amd64-installer-latest.iso
@@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux AMD64 LiveDVD
 livecd/xdm: gdm
 livecd/xsession: xfce
 
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livedvd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/latest/overlays/common/overlay/livedvd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
 
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/latest/kconfig/amd64/livecd-2.6.24.config
 boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
 boot/kernel/gentoo/packages:
 	media-libs/alsa-oss
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
index f64074ac..88c43123 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
index d870f3ba..6dc52d0d 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/weekly/specs/amd64/stage1-x32.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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
index 3b23a97e..e6bc58d1 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/weekly/specs/amd64/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
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
index de7adcc1..e98da51b 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
index afa7d969..6685dd7b 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/weekly/specs/amd64/stage2-x32.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
index 7d772a5d..9f26ee88 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/weekly/specs/amd64/stage2.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
index ca0ee869..89ab20d3 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage2-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
index f3e2a060..9c295e22 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/weekly/specs/amd64/stage3-x32.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage2-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
index 2048022e..07cf6de7 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/weekly/specs/amd64/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage2-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
index 9cd7173f..aed8aec4 100644
--- a/releases/weekly/specs/amd64/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-cloud.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: default/stage3-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bash-completion
@@ -40,8 +40,8 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	sys-process/cronie
-stage4/fsscript: /home/release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /home/release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	cloud-config|default
@@ -57,7 +57,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/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-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
index f2f20114..c1b61f7b 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
@@ -7,7 +7,7 @@ snapshot: latest
 source_subpath: default/stage3-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
-portage_confdir: /home/release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bash-completion
@@ -38,8 +38,8 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	sys-process/cronie
-stage4/fsscript: /home/release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /home/release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	cloud-config|default
@@ -55,7 +55,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /home/release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/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 b/tools/catalyst-auto
index 3d0b4191..5cf2671b 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -208,6 +208,7 @@ for i in $(find -name '*.spec'); do
   sed -i \
     -e "s:@DATESTAMP@:${DATESTAMP}:g" \
     -e "s:@GITDIR@:${GITDIR}:g" \
+    -e "s:@REPO_DIR@:${REPO_DIR}:g" \
     "${i}"
 done