From f5c1bca13f9a1062652c5feb3ed6db3b8496f192 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 19 Dec 2005 19:10:04 +0000 Subject: [PATCH] Fixed up spacing/coding style on tinderbox. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@981 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- targets/tinderbox/tinderbox-chroot.sh | 16 +++++++++------- targets/tinderbox/tinderbox-controller.sh | 7 +------ targets/tinderbox/tinderbox-preclean-chroot.sh | 3 ++- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21590949..6857d014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.468 2005/12/19 16:52:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.469 2005/12/19 19:10:04 wolf31o2 Exp $ + + 19 Dec 2005; Chris Gianelloni + targets/tinderbox/tinderbox-chroot.sh, + targets/tinderbox/tinderbox-controller.sh, + targets/tinderbox/tinderbox-preclean-chroot.sh: + Fixed up spacing/coding style on tinderbox. 19 Dec 2005; Chris Gianelloni targets/support/kill-chroot-pids.sh, targets/support/kmerge.sh, diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 55a5b870..394b2d9f 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.15 2005/12/08 15:16:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.16 2005/12/19 19:10:04 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -9,17 +9,18 @@ update_env_settings setup_myfeatures -# setup the environment +# Setup the environment export FEATURES="${clst_myfeatures}" # START THE BUILD setup_portage -#turn off auto-use: +# Turn off auto-use: export USE_ORDER="env:pkg:conf:defaults" -#back up pristine system +# Backup pristine system -rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / /tmp/rsync-bak/ +rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ + /tmp/rsync-bak/ for x in ${clst_tinderbox_packages} do @@ -38,7 +39,7 @@ do mkdir -p /tmp/packages/$x export PORT_LOGDIR="/tmp/packages/$x" run_emerge --usepkg --buildpkg --newuse $x - + if [ "$?" != "0" ] then echo "! $x" >> /tmp/tinderbox.log @@ -46,5 +47,6 @@ do echo "$x" >> /tmp/tinderbox.log fi echo "Syncing from original pristine tinderbox snapshot..." - rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude "/usr/portage/" /tmp/rsync-bak/ / + rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \ + "/usr/portage/" /tmp/rsync-bak/ / done diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh index c6075490..b19fab92 100755 --- a/targets/tinderbox/tinderbox-controller.sh +++ b/targets/tinderbox/tinderbox-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-controller.sh,v 1.4 2005/10/06 20:56:54 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-controller.sh,v 1.5 2005/12/19 19:10:04 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -10,20 +10,15 @@ case $1 in shift exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh ;; - preclean) #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh delete_from_chroot /tmp/chroot-functions.sh ;; - clean) exit 0 ;; - *) exit 1 ;; - esac - exit $? diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh index d147cbdf..abf2e936 100755 --- a/targets/tinderbox/tinderbox-preclean-chroot.sh +++ b/targets/tinderbox/tinderbox-preclean-chroot.sh @@ -1,7 +1,8 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.6 2005/07/05 21:53:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.7 2005/12/19 19:10:04 wolf31o2 Exp $ . /tmp/chroot-functions.sh + update_env_settings -- 2.26.2