From d52ba1dca0a1cd6c0ae4a4974bb7a4253f93f3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 16 Aug 2013 10:03:04 +0000 Subject: [PATCH 01/15] Add arm configs with latest seed logic and update specs accordingly --- releases/weekly/specs/arm/armeb/stage1.spec | 2 +- releases/weekly/specs/arm/armv4l/stage1.spec | 2 +- releases/weekly/specs/arm/armv4tl/stage1.spec | 2 +- .../weekly/specs/arm/armv5teb/stage1.spec | 2 +- .../weekly/specs/arm/armv5tejl/stage1.spec | 2 +- .../weekly/specs/arm/armv5tel/stage1.spec | 2 +- releases/weekly/specs/arm/armv5tl/stage1.spec | 2 +- releases/weekly/specs/arm/armv6j/stage1.spec | 2 +- releases/weekly/specs/arm/armv7a/stage1.spec | 2 +- releases/weekly/specs/arm/stage1.spec | 2 +- tools/catalyst-auto-armv4tl.conf | 55 +++++++++++++++++++ tools/catalyst-auto-armv5tel.conf | 55 +++++++++++++++++++ tools/catalyst-auto-armv6j.conf | 55 +++++++++++++++++++ tools/catalyst-auto-armv6j_hardfp.conf | 55 +++++++++++++++++++ tools/catalyst-auto-armv7a.conf | 55 +++++++++++++++++++ tools/catalyst-auto-armv7a_hardfp.conf | 55 +++++++++++++++++++ 16 files changed, 340 insertions(+), 10 deletions(-) create mode 100644 tools/catalyst-auto-armv4tl.conf create mode 100644 tools/catalyst-auto-armv5tel.conf create mode 100644 tools/catalyst-auto-armv6j.conf create mode 100644 tools/catalyst-auto-armv6j_hardfp.conf create mode 100644 tools/catalyst-auto-armv7a.conf create mode 100644 tools/catalyst-auto-armv7a_hardfp.conf diff --git a/releases/weekly/specs/arm/armeb/stage1.spec b/releases/weekly/specs/arm/armeb/stage1.spec index 80715889..633d03f5 100644 --- a/releases/weekly/specs/arm/armeb/stage1.spec +++ b/releases/weekly/specs/arm/armeb/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-armeb-2008.0 +source_subpath: default/stage3-armeb-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv4l/stage1.spec b/releases/weekly/specs/arm/armv4l/stage1.spec index 9e135473..3313986c 100644 --- a/releases/weekly/specs/arm/armv4l/stage1.spec +++ b/releases/weekly/specs/arm/armv4l/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-armv4l-2008.0 +source_subpath: default/stage3-armv4l-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv4tl/stage1.spec b/releases/weekly/specs/arm/armv4tl/stage1.spec index e5aa79b3..fd349b8a 100644 --- a/releases/weekly/specs/arm/armv4tl/stage1.spec +++ b/releases/weekly/specs/arm/armv4tl/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv4t snapshot: 2008.0 -source_subpath: default/stage3-armv4tl-2008.0 +source_subpath: default/stage3-armv4tl-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv5teb/stage1.spec b/releases/weekly/specs/arm/armv5teb/stage1.spec index e7a75456..e95549f9 100644 --- a/releases/weekly/specs/arm/armv5teb/stage1.spec +++ b/releases/weekly/specs/arm/armv5teb/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-armv5teb-2008.0 +source_subpath: default/stage3-armv5teb-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv5tejl/stage1.spec b/releases/weekly/specs/arm/armv5tejl/stage1.spec index 76d9496c..bab07c33 100644 --- a/releases/weekly/specs/arm/armv5tejl/stage1.spec +++ b/releases/weekly/specs/arm/armv5tejl/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-armv5tejl-2008.0 +source_subpath: default/stage3-armv5tejl-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv5tel/stage1.spec b/releases/weekly/specs/arm/armv5tel/stage1.spec index 9dc3f6fe..9e1fd882 100644 --- a/releases/weekly/specs/arm/armv5tel/stage1.spec +++ b/releases/weekly/specs/arm/armv5tel/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv5te snapshot: 2008.0 -source_subpath: default/stage3-armv5tel-2008.0 +source_subpath: default/stage3-armv5tel-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv5tl/stage1.spec b/releases/weekly/specs/arm/armv5tl/stage1.spec index 73c2911f..d65db65f 100644 --- a/releases/weekly/specs/arm/armv5tl/stage1.spec +++ b/releases/weekly/specs/arm/armv5tl/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-armv5tl-2008.0 +source_subpath: default/stage3-armv5tl-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv6j/stage1.spec b/releases/weekly/specs/arm/armv6j/stage1.spec index 5dc720d2..5d98e3eb 100644 --- a/releases/weekly/specs/arm/armv6j/stage1.spec +++ b/releases/weekly/specs/arm/armv6j/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv6j snapshot: 2008.0 -source_subpath: default/stage3-armv6j-2008.0 +source_subpath: default/stage3-armv6j-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv7a/stage1.spec b/releases/weekly/specs/arm/armv7a/stage1.spec index dc0a3599..f99c28ec 100644 --- a/releases/weekly/specs/arm/armv7a/stage1.spec +++ b/releases/weekly/specs/arm/armv7a/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv7a snapshot: 2008.0 -source_subpath: default/stage3-armv7a-2008.0 +source_subpath: default/stage3-armv7a-latest update_seed: yes diff --git a/releases/weekly/specs/arm/stage1.spec b/releases/weekly/specs/arm/stage1.spec index 65fe1ee9..f3bc6844 100644 --- a/releases/weekly/specs/arm/stage1.spec +++ b/releases/weekly/specs/arm/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0 snapshot: 2008.0 -source_subpath: default/stage3-arm-2008.0 +source_subpath: default/stage3-arm-latest update_seed: yes diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf new file mode 100644 index 00000000..0ba2656a --- /dev/null +++ b/tools/catalyst-auto-armv4tl.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv4tl +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf new file mode 100644 index 00000000..13fd55ea --- /dev/null +++ b/tools/catalyst-auto-armv5tel.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv5tel +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf new file mode 100644 index 00000000..719ef8a5 --- /dev/null +++ b/tools/catalyst-auto-armv6j.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf new file mode 100644 index 00000000..c22d7591 --- /dev/null +++ b/tools/catalyst-auto-armv6j_hardfp.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j/hardfloat +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf new file mode 100644 index 00000000..ca39146d --- /dev/null +++ b/tools/catalyst-auto-armv7a.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf new file mode 100644 index 00000000..3860a100 --- /dev/null +++ b/tools/catalyst-auto-armv7a_hardfp.conf @@ -0,0 +1,55 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +GITDIR=/root/releng/ + +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a_hardfloat +SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` + +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 + +EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org +EMAIL_FROM=catalyst@replaceme.local +EMAIL_SUBJECT_PREPEND="[$SUBARCH-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-$SUBARCH-*bz2 | grep -v latest | 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' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: +} From ff14403dd3fd592aa449ae319976a3c3df14f640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 16 Aug 2013 10:08:20 +0000 Subject: [PATCH 02/15] Fix path on armv7a_hardfp, thanks to steev --- tools/catalyst-auto-armv7a_hardfp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf index 3860a100..d52982d3 100644 --- a/tools/catalyst-auto-armv7a_hardfp.conf +++ b/tools/catalyst-auto-armv7a_hardfp.conf @@ -3,7 +3,7 @@ GITDIR=/root/releng/ -SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a_hardfloat +SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` SETS="default" From 10fd7de988e2b800e3cddb5e0c4d946df0e2cb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 16 Aug 2013 10:18:37 +0000 Subject: [PATCH 03/15] Fix variable --- tools/catalyst-auto-armv4tl.conf | 6 +++--- tools/catalyst-auto-armv5tel.conf | 6 +++--- tools/catalyst-auto-armv6j.conf | 6 +++--- tools/catalyst-auto-armv6j_hardfp.conf | 6 +++--- tools/catalyst-auto-armv7a.conf | 6 +++--- tools/catalyst-auto-armv7a_hardfp.conf | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf index 0ba2656a..0a09773a 100644 --- a/tools/catalyst-auto-armv4tl.conf +++ b/tools/catalyst-auto-armv4tl.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf index 13fd55ea..8554a073 100644 --- a/tools/catalyst-auto-armv5tel.conf +++ b/tools/catalyst-auto-armv5tel.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf index 719ef8a5..398bcd5a 100644 --- a/tools/catalyst-auto-armv6j.conf +++ b/tools/catalyst-auto-armv6j.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf index c22d7591..6b8c4f56 100644 --- a/tools/catalyst-auto-armv6j_hardfp.conf +++ b/tools/catalyst-auto-armv6j_hardfp.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf index ca39146d..adc178be 100644 --- a/tools/catalyst-auto-armv7a.conf +++ b/tools/catalyst-auto-armv7a.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf index d52982d3..227abfc6 100644 --- a/tools/catalyst-auto-armv7a_hardfp.conf +++ b/tools/catalyst-auto-armv7a_hardfp.conf @@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec" EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@replaceme.local -EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]" +EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" CATALYST_CONFIG=/etc/catalyst/catalyst.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | 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 @@ -51,5 +51,5 @@ pre_build() { post_build() { - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org: } From 097690e7807924187d0365ac1d0194192d2422f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 16 Aug 2013 10:23:08 +0000 Subject: [PATCH 04/15] Typo --- tools/catalyst-auto-armv4tl.conf | 2 +- tools/catalyst-auto-armv5tel.conf | 2 +- tools/catalyst-auto-armv6j.conf | 2 +- tools/catalyst-auto-armv6j_hardfp.conf | 2 +- tools/catalyst-auto-armv7a.conf | 2 +- tools/catalyst-auto-armv7a_hardfp.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf index 0a09773a..70e4d074 100644 --- a/tools/catalyst-auto-armv4tl.conf +++ b/tools/catalyst-auto-armv4tl.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv4tl -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf index 8554a073..dda8e170 100644 --- a/tools/catalyst-auto-armv5tel.conf +++ b/tools/catalyst-auto-armv5tel.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv5tel -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf index 398bcd5a..12e21d63 100644 --- a/tools/catalyst-auto-armv6j.conf +++ b/tools/catalyst-auto-armv6j.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf index 6b8c4f56..989546e9 100644 --- a/tools/catalyst-auto-armv6j_hardfp.conf +++ b/tools/catalyst-auto-armv6j_hardfp.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j/hardfloat -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf index adc178be..e9fd62f5 100644 --- a/tools/catalyst-auto-armv7a.conf +++ b/tools/catalyst-auto-armv7a.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf index 227abfc6..7c31debf 100644 --- a/tools/catalyst-auto-armv7a_hardfp.conf +++ b/tools/catalyst-auto-armv7a_hardfp.conf @@ -4,7 +4,7 @@ GITDIR=/root/releng/ SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat -SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'` +SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="default" From 9778bf06d09d831a19168fea2492540e19c6029b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 16 Aug 2013 11:28:01 +0000 Subject: [PATCH 05/15] Fix hardfp as well --- releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec | 3 +-- releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec b/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec index 59efdd17..07dd2a33 100644 --- a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec +++ b/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec @@ -4,6 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv6j snapshot: 2008.0 -source_subpath: default/stage3-armv6j_hardfp-2008.0 - +source_subpath: default/stage3-armv6j_hardfp-latest update_seed: yes diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec b/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec index 1677290c..5461288c 100644 --- a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec +++ b/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec @@ -4,6 +4,5 @@ target: stage1 rel_type: default profile: default/linux/arm/13.0/armv7a snapshot: 2008.0 -source_subpath: default/stage3-armv7a_hardfp-2008.0 - +source_subpath: default/stage3-armv7a_hardfp-latest update_seed: yes From 6cfdd7f82b3519b47026f532fb9bf94321d2d2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Sat, 17 Aug 2013 16:51:54 +0000 Subject: [PATCH 06/15] Narrow the regex a bit so f.ex stage3-amd64-nomultilib doesn't show up in latest-stage3-amd4.txt --- scripts/copy_buildsync.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh index 4375a3da..6b3f83fe 100755 --- a/scripts/copy_buildsync.sh +++ b/scripts/copy_buildsync.sh @@ -88,8 +88,7 @@ for ARCH in $ARCHES; do variants="$(find 20* \( -iname '*.iso' -o -iname '*.tar.bz2' \) -printf '%f\n' |sed -e 's,-20[012][0-9]\{5\}.*,,g' -r | sort | uniq)" echo -n '' >"${tmpdir}"/.keep.${ARCH}.txt for v in $variants ; do - #date_variant=$(find 20* -iname "${v}*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -printf '%h\n' | sed -e "s,.*/$a/autobuilds/,,g" -e 's,/.*,,g' |sort -n | tail -n1 ) - variant_path=$(find 20* -iname "${v}-*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -print | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 ) + variant_path=$(find 20* -iname "${v}-20*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -print | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 ) f="latest-${v}.txt" echo -e "${header}" >"${f}" echo -e "${variant_path}" >>${f} From 35ff9cd6161b0121e2ced6baa5553d68c56093cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Sat, 17 Aug 2013 18:58:44 +0000 Subject: [PATCH 07/15] Use the variant function for the generic latest-stage3.txt --- scripts/copy_buildsync.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh index 6b3f83fe..5c4ac37d 100755 --- a/scripts/copy_buildsync.sh +++ b/scripts/copy_buildsync.sh @@ -75,7 +75,8 @@ for ARCH in $ARCHES; do fi if [ -n "${stage3_list}" ]; then echo -e "${header}" >"${OUT_STAGE3}" - echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3} + # In the new variant preserve code there is a better way to do this + #echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3} rm -f current-stage3 # The "latest stage3" concept doesn't apply to the arm variants # that are pushed on different days of the week. @@ -92,6 +93,7 @@ for ARCH in $ARCHES; do f="latest-${v}.txt" echo -e "${header}" >"${f}" echo -e "${variant_path}" >>${f} + echo -e "${variant_path}" >>${OUT_STAGE3} rm -f "current-$v" ln -sf "${variant_path%/*}" "current-$v" echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 's,$,$,g' >>"${tmpdir}"/.keep.${ARCH}.txt From b7a016e9ca3f91441f76774a4ecebfb346f954b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Sat, 17 Aug 2013 19:13:22 +0000 Subject: [PATCH 08/15] Do not use current-stage3 symlink on arm/hppa/s390/sh since releases are pushed with different datestamp and therefore current-stage3 only links to the latest that was pushed --- scripts/copy_buildsync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh index 5c4ac37d..39f7e193 100755 --- a/scripts/copy_buildsync.sh +++ b/scripts/copy_buildsync.sh @@ -78,9 +78,9 @@ for ARCH in $ARCHES; do # In the new variant preserve code there is a better way to do this #echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3} rm -f current-stage3 - # The "latest stage3" concept doesn't apply to the arm variants + # The "latest stage3" concept doesn't apply to the arm/hppa/s390/sh variants # that are pushed on different days of the week. - if [[ ! $(echo ${outdir} | grep arm) ]]; then + if [[ ! $(echo ${outdir} | egrep 'arm|hppa|ppc|s390|sh') ]]; then ln -sf "$latest_stage3_date" current-stage3 fi fi From 3dd1d8ec721cd6b035cd438d2cba2b10d617e3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Mon, 19 Aug 2013 11:46:05 +0000 Subject: [PATCH 09/15] There was an extra done --- tools/catalyst-auto-ppc.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index a0c2d0c1..620a7059 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -44,7 +44,6 @@ pre_build() { of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ ln -sf $f $of done - done popd done } From 0fa0d1ff3029231c5c845161a4482dd127a4fded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Tue, 20 Aug 2013 06:33:42 +0000 Subject: [PATCH 10/15] Fix ia64 --- tools/catalyst-auto-ia64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index b9d4081d..f31cc6e6 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -38,7 +38,7 @@ pre_build() { git pull # Symlink the latest stages3 to build from - for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do + for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff From 142eb9ba1061b914d26411606868bec8604d5632 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 21 Aug 2013 12:00:27 -0400 Subject: [PATCH 11/15] tools-uclibc/desktop: add more linguas --- tools-uclibc/desktop/portage/make.conf.1 | 4 ++-- tools-uclibc/desktop/portage/make.conf.2 | 6 +++--- tools-uclibc/desktop/portage/make.conf.3 | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools-uclibc/desktop/portage/make.conf.1 b/tools-uclibc/desktop/portage/make.conf.1 index 597e28e4..11af927f 100644 --- a/tools-uclibc/desktop/portage/make.conf.1 +++ b/tools-uclibc/desktop/portage/make.conf.1 @@ -9,5 +9,5 @@ USE="${USE_BASE} ${USE_GCC}" source "/var/lib/layman/make.conf" -SYNC="rsync://192.168.3.1/portage" -GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo" +SYNC="rsync://67.151.215.244/portage" +GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo" diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2 index 1aceee5b..0c0c43b6 100644 --- a/tools-uclibc/desktop/portage/make.conf.2 +++ b/tools-uclibc/desktop/portage/make.conf.2 @@ -36,9 +36,9 @@ USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LA XFCE_PLUGINS="trash menu logout" INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void" VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa" -LINGUAS="en" +LINGUAS="af af_ZA ak am ar ar_SA ar_SY as as_IN ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs ca ca_ES ca_XV ca@valencia crh cs cs_CZ csb cy da de de_DE de_FR dgo dz ee el el_GR en en_CA en_GB en_US en_ZA eo es es_AR es_CL es_CO es_CR es_ES es_LA es_MX es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gl gu gu_IN he he_IL hi hi_IN hne hr hsb ht hu hu_HU hy hy_AM ia id id_ID is it it_IT ja ja_JP jv ka ka_GE kk km kn kn_IN ko ko_KR kok ks ku ky la lb lg lo lt lt_LT lv lv_LV mai me mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nr ns nso oc om or or_IN pa pa_IN pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rw sa_IN sat sco sd se sh sh_YU son si si_LK sk sk_SK sl sl_SI sq sr sr@ijekavian sr@ijekavianlatin sr@latin sr@Latn sr_BA sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tk tl tn tr ts tt ug uk uk_UA ur ur_IN ur_PK uz uz@cyrillic ve vi vi_VN wa xh yi zh zh_CN zh_HK zh_TW zu" source "/var/lib/layman/make.conf" -SYNC="rsync://192.168.3.1/portage" -GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo" +SYNC="rsync://67.151.215.244/portage" +GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo" diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3 index 5d907b14..8e16fb84 100644 --- a/tools-uclibc/desktop/portage/make.conf.3 +++ b/tools-uclibc/desktop/portage/make.conf.3 @@ -36,9 +36,9 @@ USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LA XFCE_PLUGINS="trash menu logout" INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount synaptics tslib void wacom" VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa" -LINGUAS="en" +LINGUAS="af af_ZA ak am ar ar_SA ar_SY as as_IN ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs ca ca_ES ca_XV ca@valencia crh cs cs_CZ csb cy da de de_DE de_FR dgo dz ee el el_GR en en_CA en_GB en_US en_ZA eo es es_AR es_CL es_CO es_CR es_ES es_LA es_MX es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gl gu gu_IN he he_IL hi hi_IN hne hr hsb ht hu hu_HU hy hy_AM ia id id_ID is it it_IT ja ja_JP jv ka ka_GE kk km kn kn_IN ko ko_KR kok ks ku ky la lb lg lo lt lt_LT lv lv_LV mai me mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nr ns nso oc om or or_IN pa pa_IN pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rw sa_IN sat sco sd se sh sh_YU son si si_LK sk sk_SK sl sl_SI sq sr sr@ijekavian sr@ijekavianlatin sr@latin sr@Latn sr_BA sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tk tl tn tr ts tt ug uk uk_UA ur ur_IN ur_PK uz uz@cyrillic ve vi vi_VN wa xh yi zh zh_CN zh_HK zh_TW zu" source "/var/lib/layman/make.conf" -SYNC="rsync://192.168.3.1/portage" -GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo" +SYNC="rsync://67.151.215.244/portage" +GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo" From df778287b36832181880127af9ec3492aaac26c2 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 21 Aug 2013 15:26:51 -0400 Subject: [PATCH 12/15] tools-uclibc: sandbox-2.6-r1 is stable on arm now --- .../portage.armv7a.hardened/package.accept_keywords/sandbox | 1 - .../portage.armv7a.vanilla/package.accept_keywords/sandbox | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox delete mode 100644 tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox diff --git a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox deleted file mode 100644 index b94948b3..00000000 --- a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox +++ /dev/null @@ -1 +0,0 @@ -=sys-apps/sandbox-2.6 ~arm diff --git a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox deleted file mode 100644 index b94948b3..00000000 --- a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox +++ /dev/null @@ -1 +0,0 @@ -=sys-apps/sandbox-2.6 ~arm From 7c87bca964592eb5733beb5089a355bb907f35d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Thu, 22 Aug 2013 14:11:02 +0000 Subject: [PATCH 13/15] Fix sparc --- releases/weekly/specs/sparc/sparc64/multilib/stage1.spec | 2 +- releases/weekly/specs/sparc/sparc64/multilib/stage3.spec | 2 +- releases/weekly/specs/sparc/sparc64/stage3.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec b/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec index 7be7e3a5..ad9e2cae 100644 --- a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec +++ b/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: multilib profile: default/linux/sparc/experimental/multilib snapshot: 2008.0 -source_subpath: multilib/stage3-sparc64-multilib-2008.0 +source_subpath: multilib/stage3-sparc64-multilib-latest update_seed: yes diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec b/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec index fd016e1a..db38dbd1 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-latest +source_subpath: multilib/stage2-sparc64-multilib-2008.0 diff --git a/releases/weekly/specs/sparc/sparc64/stage3.spec b/releases/weekly/specs/sparc/sparc64/stage3.spec index 5403a17d..febd32ac 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-latest +source_subpath: default/stage2-sparc64-2008.0 From 2e1dbef88d1d6fa52031a7b1af67396cdb86cdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Thu, 22 Aug 2013 14:16:09 +0000 Subject: [PATCH 14/15] Fix sparc again --- releases/weekly/specs/sparc/sparc64/stage1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/weekly/specs/sparc/sparc64/stage1.spec b/releases/weekly/specs/sparc/sparc64/stage1.spec index 5cc7ecdc..81dfe1af 100644 --- a/releases/weekly/specs/sparc/sparc64/stage1.spec +++ b/releases/weekly/specs/sparc/sparc64/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/sparc/13.0 snapshot: 2008.0 -source_subpath: default/stage3-sparc64-2008.0 +source_subpath: default/stage3-sparc64-latest update_seed: yes From 82e90079b1fc62eaf7151884b6dd22eab04bceee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Porcel?= Date: Wed, 28 Aug 2013 06:29:40 +0000 Subject: [PATCH 15/15] Fix ia64 --- releases/weekly/specs/ia64/stage3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/weekly/specs/ia64/stage3.spec b/releases/weekly/specs/ia64/stage3.spec index 25cdc4fb..abc463ff 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-latest +source_subpath: default/stage2-ia64-2008.0