From d9ff02a42ff7021e70e365446ee5a2c1c4bc8822 Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Mon, 12 Jul 2004 15:01:17 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 ++++++++- catalyst | 6 +++--- targets/embedded/embedded-chroot.sh | 5 +++-- targets/grp/grp-chroot.sh | 5 +++-- targets/livecd-stage1/livecd-stage1-chroot.sh | 5 +++-- targets/stage1/stage1-chroot.sh | 5 +++-- targets/stage3/stage3-chroot.sh | 5 +++-- targets/tinderbox/tinderbox-chroot.sh | 5 +++-- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index bac4fa28..af39f8ec 100644 --- 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 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; catalyst, targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, diff --git a/catalyst b/catalyst index 23deb3ba..75228355 100755 --- 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 @@ -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 2d79c856..4ffb0168 100755 --- 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 ff4a5be6..2564ad4c 100755 --- 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 bb6a5d47..6c7beeb7 100755 --- 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 33bc0e62..c2e07adc 100755 --- 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 64b91ef0..b6cf04c2 100755 --- 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 79ee7c77..ea536bd7 100755 --- 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 -- 2.26.2