* [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/sparc/sparc64/multilib/, releases/weekly/specs/ia64/, ...
@ 2013-08-14 17:40 Raúl Porcel
0 siblings, 0 replies; only message in thread
From: Raúl Porcel @ 2013-08-14 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 5c3f1d90364d8f77ded92736ae3c0021f2df0e0c
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 17:40:22 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 17:40:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5c3f1d90
Use latest logic for stage1 seed, hppa and ppc need some work as they have all the stages in the same dir
---
releases/weekly/specs/alpha/stage1.spec | 2 +-
releases/weekly/specs/ia64/stage3.spec | 2 +-
.../specs/sparc/sparc64/multilib/stage3.spec | 2 +-
releases/weekly/specs/sparc/sparc64/stage3.spec | 2 +-
tools/catalyst-auto-alpha.conf | 29 +++++++++++++++++++--
tools/catalyst-auto-ia64.conf | 28 +++++++++++++++++++-
tools/catalyst-auto-sparc64.conf | 30 ++++++++++++++++++++--
7 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/releases/weekly/specs/alpha/stage1.spec b/releases/weekly/specs/alpha/stage1.spec
index ae7c735..a13e967 100644
--- a/releases/weekly/specs/alpha/stage1.spec
+++ b/releases/weekly/specs/alpha/stage1.spec
@@ -4,5 +4,5 @@ version_stamp: 2008.0
rel_type: default
profile: default/linux/alpha/13.0
snapshot: 2008.0
-source_subpath: default/stage3-alpha-2008.0
+source_subpath: default/stage3-alpha-latest
update_seed: yes
diff --git a/releases/weekly/specs/ia64/stage3.spec b/releases/weekly/specs/ia64/stage3.spec
index abc463f..25cdc4f 100644
--- a/releases/weekly/specs/ia64/stage3.spec
+++ b/releases/weekly/specs/ia64/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
rel_type: default
profile: default/linux/ia64/13.0
snapshot: 2008.0
-source_subpath: default/stage2-ia64-2008.0
+source_subpath: default/stage2-ia64-latest
diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec b/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
index db38dbd..fd016e1 100644
--- a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
+++ b/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
rel_type: multilib
profile: default/linux/sparc/experimental/multilib
snapshot: 2008.0
-source_subpath: multilib/stage2-sparc64-multilib-2008.0
+source_subpath: multilib/stage2-sparc64-multilib-latest
diff --git a/releases/weekly/specs/sparc/sparc64/stage3.spec b/releases/weekly/specs/sparc/sparc64/stage3.spec
index febd32a..5403a17 100644
--- a/releases/weekly/specs/sparc/sparc64/stage3.spec
+++ b/releases/weekly/specs/sparc/sparc64/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
rel_type: default
profile: default/linux/sparc/13.0
snapshot: 2008.0
-source_subpath: default/stage2-sparc64-2008.0
+source_subpath: default/stage2-sparc64-latest
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 09d45fe..fd600f1 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -21,11 +21,36 @@ EMAIL_SUBJECT_PREPEND="[alpha-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+
pre_build() {
cd ${GITDIR}
git pull
+
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+ pushd $d
+ for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+ ln -sf $f $of
+
+ done
+ popd
+ done
}
-
+
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' /space/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /space/catalyst/builds/default/*${DATESTAMP}*.iso* alpha@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 8748eeb..47ad7d2 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -20,11 +20,37 @@ EMAIL_SUBJECT_PREPEND="[ia64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+
pre_build() {
cd ${GITDIR}
git pull
+
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
+ pushd $d
+ for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+ ln -sf $f $of
+
+ done
+ popd
+ done
}
+
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /var/tmp/catalyst/builds/default/*${DATESTAMP}*.iso* ia64@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index d87ab05..a4395a4 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -20,13 +20,39 @@ EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+
pre_build() {
cd ${GITDIR}
git pull
+
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
+ pushd $d
+ for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+ ln -sf $f $of
+
+ done
+ popd
+ done
}
+
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /var/tmp/catalyst/builds/default/*${DATESTAMP}*.iso* sparc@skimmer.gentoo.org:
- rsync -e 'ssh -i /root/.ssh/id_rsa' /var/tmp/catalyst/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@skimmer.gentoo.org:multilib
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@skimmer.gentoo.org:multilib
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-14 17:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 17:40 [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/sparc/sparc64/multilib/, releases/weekly/specs/ia64/, Raúl Porcel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox