final touches on -V flagging for builds

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@412 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index bac4fa28600ce077d3332cc127583f26d36fbc42..af39f8ec73cd6a08108bcb279fe2e2d0fc6c3858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.69 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.70 2004/07/12 15:01:17 zhen Exp $
+
+  12 Jul 2004; John Davis <zhen@gentoo.org> catalyst,
+  targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh,
+  targets/tinderbox/tinderbox-chroot.sh:
+  changing the more verbose behavior to the -V (verbose) flag
 
   12 Jul 2004; <zhen@gentoo.org> catalyst,
   targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,

diff --git a/catalyst b/catalyst
index 23deb3ba1a3ec814b07a20f0201370583787596b..7522835520e9bb8a936995dddd1b2d345674f153 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.43 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.44 2004/07/12 15:01:17 zhen Exp $
 
 # Maintained in full by John Davis <zhen@gentoo.org>
 
@@ -196,7 +196,7 @@ if __name__ == "__main__":
                        sys.exit(2)
 
                if o in ("-d", "--debug"):
-                       conf_values["DEBUG"]=1
+                       conf_values["DEBUG"]="1"
 
                if o in ("-c", "--config"):
                        myconfig=a
@@ -211,7 +211,7 @@ if __name__ == "__main__":
                        myspecfile=a
                        
                if o in ("-V", "--verbose"):
-                       conf_values["VERBOSE"]=1
+                       conf_values["VERBOSE"]="1"
        
        # import configuration file and import our main module using those settings
        parse_config(myconfig)

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 2d79c8560b646779257f466b8c092b765cee4f40..4ffb0168bee862221ce100e70a868ddeb52ba39d 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.5 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.6 2004/07/12 15:01:17 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -44,9 +44,10 @@ then
 fi
 
 ## START BUILD
-if [ "${clst_DEBUG}" ]
+if [ "${clst_VERBOSE}" ]
 then
        ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} -vp ${clst_embedded_packages} || exit 1
+       sleep 15
 fi
 
 ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} ${clst_embedded_packages} || exit 1

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index ff4a5be69604c46a06b4843c95daf6fae347de1f..2564ad4c618947407a721598225503e6100dc90b 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.4 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.5 2004/07/12 15:01:17 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -43,9 +43,10 @@ then
        unset DISTDIR
        export PKGDIR="/tmp/grp/${clst_grp_target}"
 
-       if [ -n "${clst_DEBUG}" ]
+       if [ -n "${clst_VERBOSE}" ]
        then
                emerge --usepkg --buildpkg --noreplace -vp ${clst_grp_packages} || exit 1
+               sleep 15
        fi
        
        emerge --usepkg --buildpkg --noreplace ${clst_grp_packages} || exit 1

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index bb6a5d47537e0cb0255022a468ab2c14f69609f7..6c7beeb7642268bfc2770899fd322e90602e58a2 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.4 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.5 2004/07/12 15:01:17 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -44,9 +44,10 @@ USE="build" emerge portage
 #turn off auto-use:
 export USE_ORDER="env:conf:defaults"   
 
-if [ "${clst_DEBUG}" ]
+if [ "${clst_VERBOSE}" ]
 then
        emerge ${clst_emergeopts} -vp ${clst_packages}
+       sleep 15
 fi
 
 emerge ${clst_emergeopts} ${clst_packages}

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 33bc0e62545f5a0a001a93305bb46b2b30a5c5f0..c2e07adcfc3f8bd64d23be2a7507963fb3525225 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.18 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.19 2004/07/12 15:01:17 zhen Exp $
                
 /usr/sbin/env-update
 source /etc/profile
@@ -41,9 +41,10 @@ do
        export clst_buildpkgs="${clst_buildpkgs} ${x}"
 done
 
-if [ -n "${clst_DEBUG}" ]
+if [ -n "${clst_VERBOSE}" ]
 then
        USE="-* build" emerge ${clst_myemergeopts} -vp --noreplace ${clst_buildpkgs} || exit 1
+       sleep 15
 fi
 
 USE="-* build" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 64b91ef0f7eafe128a3946baceaf63aac73a5d00..b6cf04c28d7b64cb5c9b379122660002af8251c9 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.6 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.7 2004/07/12 15:01:17 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -43,9 +43,10 @@ export CONFIG_PROTECT="-*"
 # make.conf. emerge system could merge it otherwise.
 USE="build" emerge portage
 
-if [ -n "${clst_DEBUG}" ]
+if [ -n "${clst_VERBOSE}" ]
 then
        emerge ${clst_myemergeopts} -vp system || exit 1
+       sleep 15
 fi
 
 emerge ${clst_myemergeopts} system || exit 1

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 79ee7c77005ebf55e98a962f9d42c869789d2bb0..ea536bd7674e2c72f3c499ec55f62d30598e65d4 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.4 2004/07/12 14:25:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.5 2004/07/12 15:01:17 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -41,9 +41,10 @@ rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / /tmp
 
 for x in ${clst_tinderbox_packages}
 do
-       if [ -n "${clst_DEBUG}" ]
+       if [ -n "${clst_VERBOSE}" ]
        then
                emerge --usepkg --buildpkg -vp $x
+               sleep 5
        fi
        
        emerge --usepkg --buildpkg $x