diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-05-20 03:05:33 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-05-20 03:05:33 +0000 |
| commit | 1814b1aacf22fd8aad1ad61e6625bcc1d36c616f (patch) | |
| tree | a0d9ae77b0bfad7c1d4fe82eb3ddb3bf87c6ab78 /scripts | |
| parent | Stable for HPPA (bug #367321). (diff) | |
| download | historical-1814b1aacf22fd8aad1ad61e6625bcc1d36c616f.tar.gz historical-1814b1aacf22fd8aad1ad61e6625bcc1d36c616f.tar.bz2 historical-1814b1aacf22fd8aad1ad61e6625bcc1d36c616f.zip | |
Applied Zac's path in bug 113298 to get stages building again.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index aa0fb6f42046..9b06f308c301 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.90 2010/09/11 17:06:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.91 2011/05/20 03:05:33 jmbsvicetto Exp $ # people who were here: # (drobbins, 06 Jun 2003) @@ -52,7 +52,7 @@ v_echo() { env "$@" } -cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.90 2010/09/11 17:06:47 zmedico Exp $" +cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.91 2011/05/20 03:05:33 jmbsvicetto Exp $" cvsver=${cvsver##*,v } cvsver=${cvsver%%Exp*} cvsyear=${cvsver#* } @@ -262,6 +262,7 @@ n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ <<<$n)=$p; "; done) # This stuff should never fail but will if not enough is installed. [[ -z ${myBASELAYOUT} ]] && myBASELAYOUT=">=$(portageq best_version / sys-apps/baselayout)" +[[ -z ${mySHADOW} ]] && mySHADOW=">=$(portageq best_version / sys-apps/shadow)" [[ -z ${myPORTAGE} ]] && myPORTAGE="portage" [[ -z ${myBINUTILS} ]] && myBINUTILS="binutils" [[ -z ${myGCC} ]] && myGCC="gcc" @@ -285,6 +286,7 @@ fi [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers" einfo "Using baselayout : ${myBASELAYOUT}" +einfo "Using shadow : ${mySHADOW}" einfo "Using portage : ${myPORTAGE}" einfo "Using os-headers : ${myOS_HEADERS}" einfo "Using binutils : ${myBINUTILS}" @@ -345,7 +347,7 @@ if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then : fi ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ - ${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1 + ${myGCC} ${myLIBC} ${myBASELAYOUT} ${mySHADOW} ${myZLIB} || cleanup 1 echo ------------------------------------------------------------------------------- set_bootstrap_stage 3 fi |