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] 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: }