summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-12-23 05:55:15 +0000
committerMike Frysinger <vapier@gentoo.org>2004-12-23 05:55:15 +0000
commitae2dcdf217da0b54322e22cae353c6cef39b2485 (patch)
treea1b68da1fad36bebde9a7126272145d828d8f587 /scripts
parentVersion bump with SHELL fix #75265 by halitosis@phreaker.net. (Manifest recom... (diff)
downloadgentoo-2-ae2dcdf217da0b54322e22cae353c6cef39b2485.tar.gz
gentoo-2-ae2dcdf217da0b54322e22cae353c6cef39b2485.tar.bz2
gentoo-2-ae2dcdf217da0b54322e22cae353c6cef39b2485.zip
set GENTOO_VERS and give the user a little progress info
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh18
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 95ebe806a8eb..fdb0953622f6 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.66 2004/12/23 05:39:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.67 2004/12/23 05:55:15 vapier Exp $
# people who were here:
# (drobbins, 06 Jun 2003)
@@ -18,6 +18,11 @@ if [ -e /etc/init.d/functions.sh ] ; then
echo &> /dev/null
}
fi
+show_status() {
+ local num=$1
+ shift
+ echo " [[ ($num/6) $* ]]"
+}
# Track progress of the bootstrap process to allow for
# semi-transparent resuming
@@ -33,6 +38,7 @@ set_bootstrap_stage() {
unset STRAP_EMERGE_OPTS
STRAP_RUN=1
DEBUG=0
+GENTOO_VERS=2004.3 # Mostly for fluff ;)
for opt in "$@" ; do
case "${opt}" in
@@ -81,7 +87,7 @@ fi
[[ -e /etc/profile ]] && source /etc/profile
-echo -e "\n${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}"
+echo -e "\n${GOOD}Gentoo Linux ${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}"
echo -e "Copyright 1999-2004 Gentoo Foundation; Distributed under the GPLv2"
if [[ ${STRAP_EMERGE_OPTS:0:2} = "-f" ]] ; then
echo "Fetching all bootstrap-related archives ..."
@@ -93,6 +99,7 @@ elif [[ -n ${STRAP_RUN} ]] ; then
fi
fi
echo -------------------------------------------------------------------------------
+show_status 0 Locating packages
# This should not be set to get glibc to build properly. See bug #7652.
unset LD_LIBRARY_PATH
@@ -210,7 +217,7 @@ einfo "Using texinfo : ${myTEXINFO}"
einfo "Using zlib : ${myZLIB}"
einfo "Using ncurses : ${myNCURSES}"
echo -------------------------------------------------------------------------------
-echo "Configuring environment ..."
+show_status 1 Configuring environment
# Get correct CFLAGS, CHOST, CXXFLAGS, MAKEOPTS since make.conf will be
# overwritten.
@@ -241,6 +248,7 @@ export CONFIG_PROTECT="-*"
export FEATURES="${FEATURES} -collision-protect"
if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then
+ show_status 2 Updating portage
USE="-* build bootstrap ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 2
@@ -251,6 +259,7 @@ export USE="${ORIGUSE} bootstrap ${STAGE1_USE}"
# trying to use nptl, it may be needed to flush out any old headers
# before fully bootstrapping.
if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
+ show_status 3 Emerging headers/binutils
#emerge ${STRAP_EMERGE_OPTS} -C virtual/os-headers || cleanup 1
emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} || cleanup 1
echo -------------------------------------------------------------------------------
@@ -287,6 +296,7 @@ if [[ -n ${STRAP_RUN} ]] ; then
fi
if [ ${BOOTSTRAP_STAGE} -le 3 ] ; then
+ show_status 4 Emerging gcc
emerge ${STRAP_EMERGE_OPTS} ${myGCC} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 4
@@ -304,6 +314,7 @@ if [[ -n ${STRAP_RUN} ]] ; then
fi
if [ ${BOOTSTRAP_STAGE} -le 4 ] ; then
+ show_status 5 Emerging libc/baselayout
emerge ${STRAP_EMERGE_OPTS} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 5
@@ -312,6 +323,7 @@ fi
# ncurses-5.3 and up also build c++ bindings, so we need to rebuild it
export USE="${ORIGUSE}"
if [ ${BOOTSTRAP_STAGE} -le 5 ] ; then
+ show_status 6 Re-Emerging C++ apps
emerge ${STRAP_EMERGE_OPTS} ${myNCURSES} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 6