chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

convert GITDIR over to REPO_DIR

Browse source 
The variables were representing the same thing, so merge them.
This commit is contained in:
Mike Frysinger 2016-05-19 22:17:41 -04:00
parent 170331ecea
commit d4e6ae0019
43 changed files with 76 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
releases/weekly/specs/alpha/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/alpha/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-alpha-latest source_subpath: default/stage3-alpha-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/alpha/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/alpha/13.0 profile: default/linux/alpha/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-alpha-2008.0 source_subpath: default/stage1-alpha-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/alpha/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/alpha/13.0 profile: default/linux/alpha/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-alpha-2008.0 source_subpath: default/stage2-alpha-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/hppa/hppa1.1/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-hppa1.1-latest source_subpath: default/stage3-hppa1.1-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/hppa/hppa1.1/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0 profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-hppa1.1-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

2
releases/weekly/specs/hppa/hppa1.1/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0 profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-hppa1.1-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

2
releases/weekly/specs/hppa/hppa2.0/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-hppa2.0-latest source_subpath: default/stage3-hppa2.0-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/hppa/hppa2.0/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0 profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-hppa2.0-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

2
releases/weekly/specs/hppa/hppa2.0/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/hppa/13.0 profile: default/linux/hppa/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-hppa2.0-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

2
releases/weekly/specs/ia64/installcd-stage1.spec
View file

@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/ia64/13.0 profile: default/linux/ia64/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-ia64-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: livecd/use:
deprecated deprecated

2
releases/weekly/specs/ia64/installcd-stage2-minimal.spec
View file

@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/ia64/13.0 profile: default/linux/ia64/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/livecd-stage1-ia64-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/bootargs: dokeymap
livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2 livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2

2
releases/weekly/specs/ppc/ppc32/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-ppc-latest source_subpath: default/stage3-ppc-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc32/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc32/13.0 profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-ppc-2008.0 source_subpath: default/stage1-ppc-2008.0
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc32/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc32/13.0 profile: default/linux/powerpc/ppc32/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-ppc-2008.0 source_subpath: default/stage2-ppc-2008.0
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc64/stage1-32ul.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-ppc64-32ul-latest source_subpath: default/stage3-ppc64-32ul-latest
chost: powerpc-unknown-linux-gnu chost: powerpc-unknown-linux-gnu
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc64/stage1-64ul.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-ppc64-64ul-latest source_subpath: default/stage3-ppc64-64ul-latest
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc64/stage2-32ul.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-ppc64-32ul-2008.0 source_subpath: default/stage1-ppc64-32ul-2008.0
chost: powerpc-unknown-linux-gnu chost: powerpc-unknown-linux-gnu
portage_confdir: @GITDIR@releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/ppc/ppc64/stage2-64ul.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-ppc64-64ul-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

2
releases/weekly/specs/ppc/ppc64/stage3-32ul.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/32bit-userland profile: default/linux/powerpc/ppc64/13.0/32bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-ppc64-32ul-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

2
releases/weekly/specs/ppc/ppc64/stage3-64ul.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/powerpc/ppc64/13.0/64bit-userland profile: default/linux/powerpc/ppc64/13.0/64bit-userland
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-ppc64-64ul-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

2
releases/weekly/specs/s390/s390/netboot/netboot.spec
View file

@ -8,7 +8,7 @@ target: netboot2
subarch: s390 subarch: s390
rel_type: default rel_type: default
profile: default/linux/s390/13.0 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 boot/kernel: netboot

2
releases/weekly/specs/s390/s390/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/s390/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-s390-latest source_subpath: default/stage3-s390-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/s390/s390/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0 profile: default/linux/s390/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-s390-2008.0 source_subpath: default/stage1-s390-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/s390/s390/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0 profile: default/linux/s390/13.0
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-s390-2008.0 source_subpath: default/stage2-s390-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/s390/s390x/netboot/netboot.spec
View file

@ -8,7 +8,7 @@ target: netboot2
subarch: s390x subarch: s390x
rel_type: default rel_type: default
profile: default/linux/s390/13.0/s390x 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 boot/kernel: netboot64

2
releases/weekly/specs/s390/s390x/stage1.spec
View file

@ -6,4 +6,4 @@ profile: default/linux/s390/13.0/s390x
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage3-s390x-latest source_subpath: default/stage3-s390x-latest
update_seed: yes update_seed: yes
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/s390/s390x/stage2.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0/s390x profile: default/linux/s390/13.0/s390x
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage1-s390x-2008.0 source_subpath: default/stage1-s390x-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
releases/weekly/specs/s390/s390x/stage3.spec
View file

@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/s390/13.0/s390x profile: default/linux/s390/13.0/s390x
snapshot: 2008.0 snapshot: 2008.0
source_subpath: default/stage2-s390x-2008.0 source_subpath: default/stage2-s390x-2008.0
portage_confdir: @GITDIR@/releases/weekly/portage/stages portage_confdir: @REPO_DIR@/releases/weekly/portage/stages

2
tools/catalyst-auto
View file

@ -161,7 +161,6 @@ fi
# Probe the default source dir from this script name. # Probe the default source dir from this script name.
REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")") REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")")
GITDIR=${REPO_DIR}
# Set up defaults that config files can override if they want. # Set up defaults that config files can override if they want.
SUBARCH=$(uname -m) SUBARCH=$(uname -m)
@ -273,7 +272,6 @@ for i in $(find -name '*.spec'); do
# Expand vars that the spec expects us to. # Expand vars that the spec expects us to.
sed -i \ sed -i \
-e "s:@DATESTAMP@:${DATESTAMP}:g" \ -e "s:@DATESTAMP@:${DATESTAMP}:g" \
-e "s:@GITDIR@:${GITDIR}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \ -e "s:@REPO_DIR@:${REPO_DIR}:g" \
"${i}" "${i}"
done done

6
tools/catalyst-auto-alpha.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.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" 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() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
@ -24,7 +24,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv4tl.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv5tel.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv6j.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv6j_hardfp.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv7a.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

8
tools/catalyst-auto-armv7a_hardfp.conf
View file

@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default" SETS="default"
@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec" SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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]" EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-hppa.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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" 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" 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]" EMAIL_SUBJECT_PREPEND="[hppa-auto]"
@ -29,7 +29,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-ia64.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.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" 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() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
@ -24,7 +24,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-ppc.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.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" #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]" EMAIL_SUBJECT_PREPEND="[ppc-auto]"
@ -25,7 +25,7 @@ give_latest_from_dates() {
} }
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-ppc64.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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" 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" 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]" EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
@ -27,7 +27,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-s390.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default netboot" SETS="default netboot"
@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
SET_netboot_SPECS="netboot/netboot.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() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
@ -24,7 +24,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-s390x.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # 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}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default netboot" SETS="default netboot"
@ -10,7 +10,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
SET_netboot_SPECS="netboot/netboot.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() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
@ -24,7 +24,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from

6
tools/catalyst-auto-sparc64.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
SPECS_DIR=${GITDIR}/releases/weekly/specs/sparc/sparc64 SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
SETS="default multilib" 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" 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() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
@ -24,7 +24,7 @@ give_latest_from_dates() {
pre_build() { pre_build() {
cd ${GITDIR} cd ${REPO_DIR}
git pull git pull
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from