summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-02-03 18:54:34 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-02-03 18:54:34 +0000
commitc3bf21c19a13df3da588da24fda1d2ab10a0cc3c (patch)
tree9b9b3b3f01243ce5a41db4ee07342323de16087f /scripts
parentAdd ~sparc keyword. Please see Bug 79467 for discussion and details. (diff)
downloadgentoo-2-c3bf21c19a13df3da588da24fda1d2ab10a0cc3c.tar.gz
gentoo-2-c3bf21c19a13df3da588da24fda1d2ab10a0cc3c.tar.bz2
gentoo-2-c3bf21c19a13df3da588da24fda1d2ab10a0cc3c.zip
Revert -e as it is superceded by bootstrap-new.sh
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 325382e3560b..7c3bd6144c72 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.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-x86/scripts/bootstrap.sh,v 1.71 2005/01/21 23:59:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.72 2005/02/03 18:54:34 wolf31o2 Exp $
# people who were here:
# (drobbins, 06 Jun 2003)
@@ -75,7 +75,7 @@ for opt in "$@" ; do
--resume|-r) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";;
--verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"; V_ECHO=v_echo;;
--version)
- cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.71 2005/01/21 23:59:08 wolf31o2 Exp $"
+ cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.72 2005/02/03 18:54:34 wolf31o2 Exp $"
cvsver=${cvsver##*,v }
einfo "Gentoo ${GENTOO_VERS} bootstrap ${cvsver%%Exp*}"
exit 0
@@ -339,7 +339,7 @@ fi
if [ ${BOOTSTRAP_STAGE} -le 4 ] ; then
show_status 5 Emerging libc/baselayout
- ${V_ECHO} emerge -e ${STRAP_EMERGE_OPTS} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1
+ ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 5
fi