Use new portage_confidir and stop using hardcoded paths.

21 files changed, 23 insertions, 23 deletions

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index ef6fc560..378dfed4 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: @REPO_DIR@/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index cafb2127..b49ffeb0 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: @REPO_DIR@/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 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 8ef21fca..e4c41912 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-latest-selinux
-portage_confdir: @REPO_DIR@/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index d1a31279..126b2fd7 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: @REPO_DIR@/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
index 407cc7bd..d1a5f3ea 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: @REPO_DIR@/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index 4849a28c..f49ca3c9 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: @REPO_DIR@/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
diff --git a/releases/weekly/specs/ia64/installcd-stage1.spec b/releases/weekly/specs/ia64/installcd-stage1.spec
index 16a22777..36d86099 100644
--- a/releases/weekly/specs/ia64/installcd-stage1.spec
+++ b/releases/weekly/specs/ia64/installcd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/ia64/13.0
 snapshot: 2008.0
 source_subpath: default/stage3-ia64-2008.0
-portage_confdir: @GITDIR@/releases/weekly/portage/installcd
+portage_confdir: @GITDIR@/releases/weekly/portage/isos
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
index bcce5d39..4cded759 100644
--- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/ia64/13.0
 snapshot: 2008.0
 source_subpath: default/livecd-stage1-ia64-2008.0
-portage_confdir: @GITDIR@/releases/weekly/portage/installcd
+portage_confdir: @GITDIR@/releases/weekly/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
index 57774e76..beafe8b5 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
@@ -6,7 +6,7 @@ profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/stage3-i686-hardened-latest
 compression_mode: pixz_x
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index e3c1191c..db85f464 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/livecd-stage1-x86-latest
-portage_confdir: /home/release/releng/releases/weekly/portage/admincd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 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/x86/admincd-3.18.9.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
 boot/kernel/gentoo/use:
 	-*
 	alsa
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index 484f1999..c4d09225 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/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/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index 9a96451d..df8b72a8 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: hardened/stage1-i686-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/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 69ff439a..52b786f7 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: hardened/stage2-i686-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/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
index 46f7a3e3..1f49b756 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/weekly/specs/x86/i686/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/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
index 07ee4b3a..a8dfddfe 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/weekly/specs/x86/i686/stage2.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-i686-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/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
index 814d9861..43100aab 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/weekly/specs/x86/i686/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage2-i686-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/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec
index 627feb8b..f0de078c 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/installcd-stage1.spec
@@ -6,7 +6,7 @@ profile: default/linux/x86/13.0
 snapshot: latest
 source_subpath: default/stage3-i486-latest
 compression_mode: pixz_x
-portage_confdir: /home/release/releng/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
 	deprecated
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index 8d5c2cb6..3c16550e 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 source_subpath: default/livecd-stage1-x86-latest
-portage_confdir: /home/release/releng/releases/weekly/portage/installcd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 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/x86/installcd-3.18.12.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/installcd-3.18.12.config
 boot/kernel/gentoo/use:
 	-*
 	alsa
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
index 05e885b4..3c7597fa 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/weekly/specs/x86/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/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
index 35b0ac5e..67de4d98 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/weekly/specs/x86/stage2.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage1-i486-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/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
index e13f8367..18eeb14a 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/weekly/specs/x86/stage3.spec
@@ -7,4 +7,4 @@ snapshot: latest
 source_subpath: default/stage2-i486-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