diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-07 19:42:54 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-07 19:42:54 +0000 |
| commit | bee17a72ac4fe1f5ebcda66c6dcca50a4a21798f (patch) | |
| tree | 36305460ad9db2b729ad49c75adc723051e5faf2 /scripts | |
| parent | Do not link cracklib and pwdb static, bug #83899. Add /dev/dri/\* to (diff) | |
| download | gentoo-2-bee17a72ac4fe1f5ebcda66c6dcca50a4a21798f.tar.gz gentoo-2-bee17a72ac4fe1f5ebcda66c6dcca50a4a21798f.tar.bz2 gentoo-2-bee17a72ac4fe1f5ebcda66c6dcca50a4a21798f.zip | |
Use virtual/baselayout now.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap-new.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap-new.sh b/scripts/bootstrap-new.sh index d13f3dcdccef..318729b0a92c 100644 --- a/scripts/bootstrap-new.sh +++ b/scripts/bootstrap-new.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-new.sh,v 1.6 2005/03/02 23:44:57 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-new.sh,v 1.7 2005/03/07 19:42:54 wolf31o2 Exp $ # people who were here: # (drobbins, 06 Jun 2003) @@ -79,7 +79,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-new.sh,v 1.6 2005/03/02 23:44:57 azarah Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-new.sh,v 1.7 2005/03/07 19:42:54 wolf31o2 Exp $" cvsver=${cvsver##*,v } einfo "Gentoo ${GENTOO_VERS} bootstrap ${cvsver%%Exp*}" exit 0 @@ -230,7 +230,7 @@ sed 's/[][,]//g; s/ /\n/g; s/\*//g' | while read p; do n=${p##*/}; n=${n%\'}; 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="baselayout" +[[ -z ${myBASELAYOUT} ]] && myBASELAYOUT="$(portageq best_version / virtual/baselayout)" [[ -z ${myPORTAGE} ]] && myPORTAGE="portage" [[ -z ${myBINUTILS} ]] && myBINUTILS="binutils" [[ -z ${myGCC} ]] && myGCC="gcc" |