From 8c3d22fe7443837b2de0ba34afe12f782c1f37af Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 19 Dec 2005 15:28:42 +0000 Subject: [PATCH] Fixed up spacing/coding style on stages 2 and 3. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@977 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- targets/stage2/stage2-chroot.sh | 5 ++--- targets/stage2/stage2-controller.sh | 13 ++++--------- targets/stage2/stage2-preclean-chroot.sh | 5 ++--- targets/stage3/stage3-chroot.sh | 5 ++--- targets/stage3/stage3-controller.sh | 10 ++-------- targets/stage3/stage3-preclean-chroot.sh | 3 ++- 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9084ff1e..f330c6bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.464 2005/12/19 15:23:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.465 2005/12/19 15:28:42 wolf31o2 Exp $ + + 19 Dec 2005; Chris Gianelloni + targets/stage2/stage2-chroot.sh, targets/stage2/stage2-controller.sh, + targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-chroot.sh, + targets/stage3/stage3-controller.sh, + targets/stage3/stage3-preclean-chroot.sh: + Fixed up spacing/coding style on stages 2 and 3 19 Dec 2005; Chris Gianelloni targets/stage1/stage1-chroot.sh, targets/stage1/stage1-controller.sh, diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 193df8c3..40b0a34f 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-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/stage2/stage2-chroot.sh,v 1.17 2005/12/08 15:16:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.18 2005/12/19 15:28:42 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -10,8 +10,7 @@ update_env_settings setup_myfeatures setup_myemergeopts - -## setup the environment +# Setup the environment export FEATURES="${clst_myfeatures} nodoc noman noinfo" if [ "${clst_VERBOSE}" ] diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh index e7656042..83ce033e 100755 --- a/targets/stage2/stage2-controller.sh +++ b/targets/stage2/stage2-controller.sh @@ -1,9 +1,9 @@ #!/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/stage2/stage2-controller.sh,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $ -. ${clst_sharedir}/targets/support/functions.sh +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-controller.sh,v 1.4 2005/12/19 15:28:42 wolf31o2 Exp $ +. ${clst_sharedir}/targets/support/functions.sh # Only put commands in this section that you want every target to execute. # This is a global default file and will affect every target @@ -11,25 +11,20 @@ case $1 in enter) ${clst_CHROOT} ${clst_chroot_path} ;; - run) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + exec_in_chroot \ + ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh ;; - preclean) exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} ;; - clean) exit 0 ;; - *) exit 1 ;; - esac - exit $? diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh index 8103aa7d..545def92 100755 --- a/targets/stage2/stage2-preclean-chroot.sh +++ b/targets/stage2/stage2-preclean-chroot.sh @@ -1,11 +1,11 @@ #!/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/stage2/stage2-preclean-chroot.sh,v 1.8 2005/12/08 15:16:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-preclean-chroot.sh,v 1.9 2005/12/19 15:28:42 wolf31o2 Exp $ . /tmp/chroot-functions.sh -update_env_settings +update_env_settings if [ -n "${clst_CCACHE}" ] then @@ -18,4 +18,3 @@ then fi rm -f /var/log/emerge.log - diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index 367236f4..63244b0b 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-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/stage3/stage3-chroot.sh,v 1.25 2005/12/09 19:03:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.26 2005/12/19 15:28:42 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -10,8 +10,7 @@ update_env_settings setup_myfeatures setup_myemergeopts - -# setup the build environment +# Setup the build environment export FEATURES="${clst_myfeatures}" export USE="${USE} ${clst_HOSTUSE}" diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh index afb80dfb..4ec92442 100755 --- a/targets/stage3/stage3-controller.sh +++ b/targets/stage3/stage3-controller.sh @@ -1,9 +1,9 @@ #!/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/stage3/stage3-controller.sh,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $ -. ${clst_sharedir}/targets/support/functions.sh +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-controller.sh,v 1.4 2005/12/19 15:28:42 wolf31o2 Exp $ +. ${clst_sharedir}/targets/support/functions.sh # Only put commands in this section that you want every target to execute. # This is a global default file and will affect every target @@ -11,25 +11,19 @@ case $1 in enter) ${clst_CHROOT} ${clst_chroot_path} ;; - run) shift export clst_packages="$*" exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh ;; - preclean) exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} ;; - clean) exit 0 ;; - *) exit 1 ;; - esac - exit $? diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh index 39f8762b..8e99f7af 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -1,9 +1,10 @@ #!/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/stage3/stage3-preclean-chroot.sh,v 1.8 2005/12/08 15:16:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-preclean-chroot.sh,v 1.9 2005/12/19 15:28:42 wolf31o2 Exp $ . /tmp/chroot-functions.sh + update_env_settings if [ -n "${clst_CCACHE}" ] -- 2.26.2