commit: 6a2361a8eae59ade409cb2a3d868865813f8cbce
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:14:42 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 20:14:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6a2361a8
make portage_confdir location dynamic
Don't hardcode /root/ or /release/ paths to the releng git checkout.
Use the active git repo as the base path instead.
releases/weekly/specs/alpha/stage1.spec | 2 +-
releases/weekly/specs/alpha/stage2.spec | 2 +-
releases/weekly/specs/alpha/stage3.spec | 2 +-
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/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/ppc64/stage1-32ul.spec | 2 +-
releases/weekly/specs/ppc/ppc64/stage1-64ul.spec | 2 +-
releases/weekly/specs/ppc/ppc64/stage2-32ul.spec | 2 +-
releases/weekly/specs/ppc/ppc64/stage2-64ul.spec | 2 +-
releases/weekly/specs/ppc/ppc64/stage3-32ul.spec | 2 +-
releases/weekly/specs/ppc/ppc64/stage3-64ul.spec | 2 +-
releases/weekly/specs/s390/s390/netboot/netboot.spec | 2 +-
releases/weekly/specs/s390/s390/stage1.spec | 1 +
releases/weekly/specs/s390/s390/stage2.spec | 1 +
releases/weekly/specs/s390/s390/stage3.spec | 1 +
releases/weekly/specs/s390/s390x/netboot/netboot.spec | 2 +-
releases/weekly/specs/s390/s390x/stage1.spec | 1 +
releases/weekly/specs/s390/s390x/stage2.spec | 1 +
releases/weekly/specs/s390/s390x/stage3.spec | 1 +
tools/catalyst-auto | 6 ++++++
27 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/releases/weekly/specs/alpha/stage1.spec
b/releases/weekly/specs/alpha/stage1.spec
index 395efd1..25780b2 100644
--- a/releases/weekly/specs/alpha/stage1.spec
+++ b/releases/weekly/specs/alpha/stage1.spec
@@ -6,4 +6,4 @@ profile: default/linux/alpha/13.0
snapshot: 2008.0
source_subpath: default/stage3-alpha-latest
update_seed: yes
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/alpha/stage2.spec
b/releases/weekly/specs/alpha/stage2.spec
index 2f576c7..d1d0513 100644
--- a/releases/weekly/specs/alpha/stage2.spec
+++ b/releases/weekly/specs/alpha/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/alpha/13.0
snapshot: 2008.0
source_subpath: default/stage1-alpha-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/alpha/stage3.spec
b/releases/weekly/specs/alpha/stage3.spec
index 8d0fbc4..799dd4d 100644
--- a/releases/weekly/specs/alpha/stage3.spec
+++ b/releases/weekly/specs/alpha/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/alpha/13.0
snapshot: 2008.0
source_subpath: default/stage2-alpha-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa1.1/stage1.spec
b/releases/weekly/specs/hppa/hppa1.1/stage1.spec
index 555417b..79281eb 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage1.spec
+++ b/releases/weekly/specs/hppa/hppa1.1/stage1.spec
@@ -6,4 +6,4 @@ profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage3-hppa1.1-latest
update_seed: yes
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa1.1/stage2.spec
b/releases/weekly/specs/hppa/hppa1.1/stage2.spec
index ce6e1a7..616fd39 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage2.spec
+++ b/releases/weekly/specs/hppa/hppa1.1/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage1-hppa1.1-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa1.1/stage3.spec
b/releases/weekly/specs/hppa/hppa1.1/stage3.spec
index 4c8a6f2..282076c 100644
--- a/releases/weekly/specs/hppa/hppa1.1/stage3.spec
+++ b/releases/weekly/specs/hppa/hppa1.1/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage2-hppa1.1-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa2.0/stage1.spec
b/releases/weekly/specs/hppa/hppa2.0/stage1.spec
index 006568c..b004a0a 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage1.spec
+++ b/releases/weekly/specs/hppa/hppa2.0/stage1.spec
@@ -6,4 +6,4 @@ profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage3-hppa2.0-latest
update_seed: yes
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa2.0/stage2.spec
b/releases/weekly/specs/hppa/hppa2.0/stage2.spec
index 3017898..b9beffb 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage2.spec
+++ b/releases/weekly/specs/hppa/hppa2.0/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage1-hppa2.0-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/hppa/hppa2.0/stage3.spec
b/releases/weekly/specs/hppa/hppa2.0/stage3.spec
index 6306c0d..88a22da 100644
--- a/releases/weekly/specs/hppa/hppa2.0/stage3.spec
+++ b/releases/weekly/specs/hppa/hppa2.0/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0
snapshot: 2008.0
source_subpath: default/stage2-hppa2.0-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc32/stage1.spec
b/releases/weekly/specs/ppc/ppc32/stage1.spec
index b536c8b..7a333e8 100644
--- a/releases/weekly/specs/ppc/ppc32/stage1.spec
+++ b/releases/weekly/specs/ppc/ppc32/stage1.spec
@@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0
source_subpath: default/stage3-ppc-latest
update_seed: yes
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc32/stage2.spec
b/releases/weekly/specs/ppc/ppc32/stage2.spec
index 0d52715..ff7b66f 100644
--- a/releases/weekly/specs/ppc/ppc32/stage2.spec
+++ b/releases/weekly/specs/ppc/ppc32/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0
source_subpath: default/stage1-ppc-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc32/stage3.spec
b/releases/weekly/specs/ppc/ppc32/stage3.spec
index 19d5d52..e8b8fee 100644
--- a/releases/weekly/specs/ppc/ppc32/stage3.spec
+++ b/releases/weekly/specs/ppc/ppc32/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0
source_subpath: default/stage2-ppc-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
b/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
index 678076e..ff47f2b 100644
--- a/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
@@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0
source_subpath: default/stage3-ppc64-32ul-latest
chost: powerpc-unknown-linux-gnu
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage1-64ul.spec
b/releases/weekly/specs/ppc/ppc64/stage1-64ul.spec
index 2e007be..9895776 100644
--- a/releases/weekly/specs/ppc/ppc64/stage1-64ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage1-64ul.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0
source_subpath: default/stage3-ppc64-64ul-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
b/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
index 6a299db..f30c9d8 100644
--- a/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
@@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0
source_subpath: default/stage1-ppc64-32ul-2008.0
chost: powerpc-unknown-linux-gnu
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage2-64ul.spec
b/releases/weekly/specs/ppc/ppc64/stage2-64ul.spec
index 9cf4d89..cc5a7a1 100644
--- a/releases/weekly/specs/ppc/ppc64/stage2-64ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage2-64ul.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0
source_subpath: default/stage1-ppc64-64ul-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
b/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
index ccdbd4f..1cf56ef 100644
--- a/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0
source_subpath: default/stage2-ppc64-32ul-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/ppc/ppc64/stage3-64ul.spec
b/releases/weekly/specs/ppc/ppc64/stage3-64ul.spec
index ecde7a2..65372ed 100644
--- a/releases/weekly/specs/ppc/ppc64/stage3-64ul.spec
+++ b/releases/weekly/specs/ppc/ppc64/stage3-64ul.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0
source_subpath: default/stage2-ppc64-64ul-2008.0
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @GITDIR@releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390/netboot/netboot.spec
b/releases/weekly/specs/s390/s390/netboot/netboot.spec
index 155bc76..9bb0669 100644
--- a/releases/weekly/specs/s390/s390/netboot/netboot.spec
+++ b/releases/weekly/specs/s390/s390/netboot/netboot.spec
@@ -8,7 +8,7 @@ target: netboot2
subarch: s390
rel_type: default
profile: default/linux/s390/13.0
-portage_confdir: /root/releng/releases/weekly/specs/s390/s390/netboot/portage
+portage_confdir: @GITDIR@/releases/weekly/specs/s390/s390/netboot/portage
boot/kernel: netboot
diff --git a/releases/weekly/specs/s390/s390/stage1.spec
b/releases/weekly/specs/s390/s390/stage1.spec
index 8d89acb..3cbdb8b 100644
--- a/releases/weekly/specs/s390/s390/stage1.spec
+++ b/releases/weekly/specs/s390/s390/stage1.spec
@@ -6,3 +6,4 @@ profile: default/linux/s390/13.0
snapshot: 2008.0
source_subpath: default/stage3-s390-latest
update_seed: yes
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390/stage2.spec
b/releases/weekly/specs/s390/s390/stage2.spec
index b8e475b..d3a753f 100644
--- a/releases/weekly/specs/s390/s390/stage2.spec
+++ b/releases/weekly/specs/s390/s390/stage2.spec
@@ -5,3 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0
snapshot: 2008.0
source_subpath: default/stage1-s390-2008.0
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390/stage3.spec
b/releases/weekly/specs/s390/s390/stage3.spec
index 7a129a7..663decb 100644
--- a/releases/weekly/specs/s390/s390/stage3.spec
+++ b/releases/weekly/specs/s390/s390/stage3.spec
@@ -5,3 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0
snapshot: 2008.0
source_subpath: default/stage2-s390-2008.0
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390x/netboot/netboot.spec
b/releases/weekly/specs/s390/s390x/netboot/netboot.spec
index b029b22..17e31f9 100644
--- a/releases/weekly/specs/s390/s390x/netboot/netboot.spec
+++ b/releases/weekly/specs/s390/s390x/netboot/netboot.spec
@@ -8,7 +8,7 @@ target: netboot2
subarch: s390x
rel_type: default
profile: default/linux/s390/13.0/s390x
-portage_confdir: /root/releng/releases/weekly/specs/s390/s390x/netboot/portage
+portage_confdir: @GITDIR@/releases/weekly/specs/s390/s390x/netboot/portage
boot/kernel: netboot64
diff --git a/releases/weekly/specs/s390/s390x/stage1.spec
b/releases/weekly/specs/s390/s390x/stage1.spec
index d57f10e..f0e305e 100644
--- a/releases/weekly/specs/s390/s390x/stage1.spec
+++ b/releases/weekly/specs/s390/s390x/stage1.spec
@@ -6,3 +6,4 @@ profile: default/linux/s390/13.0/s390x
snapshot: 2008.0
source_subpath: default/stage3-s390x-latest
update_seed: yes
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390x/stage2.spec
b/releases/weekly/specs/s390/s390x/stage2.spec
index d83acc0..da5cce6 100644
--- a/releases/weekly/specs/s390/s390x/stage2.spec
+++ b/releases/weekly/specs/s390/s390x/stage2.spec
@@ -5,3 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0/s390x
snapshot: 2008.0
source_subpath: default/stage1-s390x-2008.0
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/s390/s390x/stage3.spec
b/releases/weekly/specs/s390/s390x/stage3.spec
index 1e091bc..5040dbb 100644
--- a/releases/weekly/specs/s390/s390x/stage3.spec
+++ b/releases/weekly/specs/s390/s390x/stage3.spec
@@ -5,3 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0/s390x
snapshot: 2008.0
source_subpath: default/stage2-s390x-2008.0
+portage_confdir: @GITDIR@/releases/weekly/portage/stages
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 684531f..3d0b419 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -203,6 +203,12 @@ for i in $(find -name '*.spec'); do
sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i}
done
fi
+
+ # Expand vars that the spec expects us to.
+ sed -i \
+ -e "s:@DATESTAMP@:${DATESTAMP}:g" \
+ -e "s:@GITDIR@:${GITDIR}:g" \
+ "${i}"
done
if [ "${testing}" -eq 1 ]; then
