commit: d4e6ae0019d83a096f90c61d68e437a37910256e Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Fri May 20 02:17:41 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Fri May 20 02:17:41 2016 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4e6ae00
convert GITDIR over to REPO_DIR The variables were representing the same thing, so merge them. 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/ia64/installcd-stage1.spec | 2 +- releases/weekly/specs/ia64/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/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 | 2 +- releases/weekly/specs/s390/s390/stage2.spec | 2 +- releases/weekly/specs/s390/s390/stage3.spec | 2 +- releases/weekly/specs/s390/s390x/netboot/netboot.spec | 2 +- releases/weekly/specs/s390/s390x/stage1.spec | 2 +- releases/weekly/specs/s390/s390x/stage2.spec | 2 +- releases/weekly/specs/s390/s390x/stage3.spec | 2 +- tools/catalyst-auto | 2 -- tools/catalyst-auto-alpha.conf | 6 +++--- tools/catalyst-auto-armv4tl.conf | 8 ++++---- tools/catalyst-auto-armv5tel.conf | 8 ++++---- tools/catalyst-auto-armv6j.conf | 8 ++++---- tools/catalyst-auto-armv6j_hardfp.conf | 8 ++++---- tools/catalyst-auto-armv7a.conf | 8 ++++---- tools/catalyst-auto-armv7a_hardfp.conf | 8 ++++---- tools/catalyst-auto-hppa.conf | 6 +++--- tools/catalyst-auto-ia64.conf | 6 +++--- tools/catalyst-auto-ppc.conf | 6 +++--- tools/catalyst-auto-ppc64.conf | 6 +++--- tools/catalyst-auto-s390.conf | 6 +++--- tools/catalyst-auto-s390x.conf | 6 +++--- tools/catalyst-auto-sparc64.conf | 6 +++--- 43 files changed, 76 insertions(+), 78 deletions(-) diff --git a/releases/weekly/specs/alpha/stage1.spec b/releases/weekly/specs/alpha/stage1.spec index 25780b2..e30be69 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/alpha/stage2.spec b/releases/weekly/specs/alpha/stage2.spec index d1d0513..9d71547 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/alpha/stage3.spec b/releases/weekly/specs/alpha/stage3.spec index 799dd4d..c4582a1 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 79281eb..88242fe 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 616fd39..7212c85 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 282076c..d8c438d 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 b004a0a..6905ae6 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 b9beffb..8bb2ab7 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 88a22da..e4414fb 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: @GITDIR@/releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/ia64/installcd-stage1.spec b/releases/weekly/specs/ia64/installcd-stage1.spec index 36d8609..6259406 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/isos +portage_confdir: @REPO_DIR@/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 4cded75..3adf748 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/isos +portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2 diff --git a/releases/weekly/specs/ppc/ppc32/stage1.spec b/releases/weekly/specs/ppc/ppc32/stage1.spec index 7a333e8..a209035 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/ppc/ppc32/stage2.spec b/releases/weekly/specs/ppc/ppc32/stage2.spec index ff7b66f..017e2f9 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/ppc/ppc32/stage3.spec b/releases/weekly/specs/ppc/ppc32/stage3.spec index e8b8fee..bb1c80e 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 ff47f2b..5b4d26b 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 9895776..271280b 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 f30c9d8..2bf937b 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 cc5a7a1..15bc820 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 1cf56ef..df47152 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 65372ed..40038ca 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: @GITDIR@releases/weekly/portage/stages +portage_confdir: @REPO_DIR@/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 9bb0669..c2a9067 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: @GITDIR@/releases/weekly/specs/s390/s390/netboot/portage +portage_confdir: @REPO_DIR@/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 3cbdb8b..3cc648b 100644 --- a/releases/weekly/specs/s390/s390/stage1.spec +++ b/releases/weekly/specs/s390/s390/stage1.spec @@ -6,4 +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 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/s390/s390/stage2.spec b/releases/weekly/specs/s390/s390/stage2.spec index d3a753f..3dd291b 100644 --- a/releases/weekly/specs/s390/s390/stage2.spec +++ b/releases/weekly/specs/s390/s390/stage2.spec @@ -5,4 +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 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/s390/s390/stage3.spec b/releases/weekly/specs/s390/s390/stage3.spec index 663decb..c58d0e5 100644 --- a/releases/weekly/specs/s390/s390/stage3.spec +++ b/releases/weekly/specs/s390/s390/stage3.spec @@ -5,4 +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 +portage_confdir: @REPO_DIR@/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 17e31f9..9167bb0 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: @GITDIR@/releases/weekly/specs/s390/s390x/netboot/portage +portage_confdir: @REPO_DIR@/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 f0e305e..905a493 100644 --- a/releases/weekly/specs/s390/s390x/stage1.spec +++ b/releases/weekly/specs/s390/s390x/stage1.spec @@ -6,4 +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 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/s390/s390x/stage2.spec b/releases/weekly/specs/s390/s390x/stage2.spec index da5cce6..18de7b8 100644 --- a/releases/weekly/specs/s390/s390x/stage2.spec +++ b/releases/weekly/specs/s390/s390x/stage2.spec @@ -5,4 +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 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/s390/s390x/stage3.spec b/releases/weekly/specs/s390/s390x/stage3.spec index 5040dbb..fc3e873 100644 --- a/releases/weekly/specs/s390/s390x/stage3.spec +++ b/releases/weekly/specs/s390/s390x/stage3.spec @@ -5,4 +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 +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/tools/catalyst-auto b/tools/catalyst-auto index b933aa6..beb7aa8 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -161,7 +161,6 @@ fi # Probe the default source dir from this script name. REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")") -GITDIR=${REPO_DIR} # Set up defaults that config files can override if they want. SUBARCH=$(uname -m) @@ -273,7 +272,6 @@ for i in $(find -name '*.spec'); do # Expand vars that the spec expects us to. sed -i \ -e "s:@DATESTAMP@:${DATESTAMP}:g" \ - -e "s:@GITDIR@:${GITDIR}:g" \ -e "s:@REPO_DIR@:${REPO_DIR}:g" \ "${i}" done diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index 601f9ef..ae5ec8b 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=${GITDIR}/releases/weekly/specs/alpha +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/alpha SPECS="stage1.spec stage2.spec stage3.spec" #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" @@ -10,7 +10,7 @@ SPECS="stage1.spec stage2.spec stage3.spec" OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/alpha +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/alpha give_latest_from_dates() { sed 's,-20,~20,g' | \ @@ -24,7 +24,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf index da46a4b..d37bf1c 100644 --- a/tools/catalyst-auto-armv4tl.conf +++ b/tools/catalyst-auto-armv4tl.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv4tl +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf index 882d555..0945ad5 100644 --- a/tools/catalyst-auto-armv5tel.conf +++ b/tools/catalyst-auto-armv5tel.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv5tel +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf index 56891ba..ad4c8f5 100644 --- a/tools/catalyst-auto-armv6j.conf +++ b/tools/catalyst-auto-armv6j.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf index 55e7eb0..845cafa 100644 --- a/tools/catalyst-auto-armv6j_hardfp.conf +++ b/tools/catalyst-auto-armv6j_hardfp.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j/hardfloat +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf index bf1d626..b3ca018 100644 --- a/tools/catalyst-auto-armv7a.conf +++ b/tools/catalyst-auto-armv7a.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf index f95c539..c30b132 100644 --- a/tools/catalyst-auto-armv7a_hardfp.conf +++ b/tools/catalyst-auto-armv7a_hardfp.conf @@ -1,9 +1,9 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -GITDIR=/root/releng/ +REPO_DIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/sparc +#KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index f87b60b..4eb0565 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=${GITDIR}/releases/weekly/specs/hppa +SPECS_DIR=${REPO_DIR}/releases/weekly/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=${GITDIR}/releases/weekly/kconfig/hppa +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/hppa EMAIL_SUBJECT_PREPEND="[hppa-auto]" @@ -29,7 +29,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 8d7e3e5..ad7dbd4 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=${GITDIR}/releases/weekly/specs/ia64 +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ia64 SPECS="stage1.spec stage2.spec stage3.spec" #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" @@ -10,7 +10,7 @@ SPECS="stage1.spec stage2.spec stage3.spec" OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64 +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/ia64 give_latest_from_dates() { sed 's,-20,~20,g' | \ @@ -24,7 +24,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 6822ef0..f5a7e9a 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=${GITDIR}/releases/weekly/specs/ppc/ppc32 +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc32 SPECS="stage1.spec stage2.spec stage3.spec" #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" @@ -10,7 +10,7 @@ SPECS="stage1.spec stage2.spec stage3.spec" #OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc EMAIL_SUBJECT_PREPEND="[ppc-auto]" @@ -25,7 +25,7 @@ give_latest_from_dates() { } pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf index 7a4a970..d5ef926 100644 --- a/tools/catalyst-auto-ppc64.conf +++ b/tools/catalyst-auto-ppc64.conf @@ -1,7 +1,7 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -SPECS_DIR=${GITDIR}/releases/weekly/specs/ppc/ppc64 +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64 SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec" @@ -11,7 +11,7 @@ SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc EMAIL_SUBJECT_PREPEND="[ppc64-auto]" @@ -27,7 +27,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index f87fb03..19a8bac 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=${GITDIR}/releases/weekly/specs/s390/s390 +SPECS_DIR=${REPO_DIR}/releases/weekly/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 stage2.spec stage3.spec" SET_netboot_SPECS="netboot/netboot.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390 give_latest_from_dates() { sed 's,-20,~20,g' | \ @@ -24,7 +24,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 24a1384..01abfe3 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=${GITDIR}/releases/weekly/specs/s390/s390x +SPECS_DIR=${REPO_DIR}/releases/weekly/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 stage2.spec stage3.spec" SET_netboot_SPECS="netboot/netboot.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390 give_latest_from_dates() { sed 's,-20,~20,g' | \ @@ -24,7 +24,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 2f1834a..59a75c3 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -1,7 +1,7 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -SPECS_DIR=${GITDIR}/releases/weekly/specs/sparc/sparc64 +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64 SETS="default multilib" @@ -10,7 +10,7 @@ SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec" -KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc +KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc give_latest_from_dates() { sed 's,-20,~20,g' | \ @@ -24,7 +24,7 @@ give_latest_from_dates() { pre_build() { - cd ${GITDIR} + cd ${REPO_DIR} git pull # Symlink the latest stages3 to build from