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.
2016-03-20 16:14:42 -04:00 · 2016-03-20 16:14:42 -04:00 · 6a2361a8ea
parent 0f867a3dfd
commit 6a2361a8ea
27 changed files with 32 additions and 20 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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