diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-11-17 01:51:06 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-11-17 01:51:06 +0000 |
| commit | 6eed65c04a6e95161b883fc010e3706ec4c404db (patch) | |
| tree | 6032e8719fd242d4100e9212b49a097d90ac791d | |
| parent | Version bump for CVE-2011-3439, bug #390623. Remove old version. (diff) | |
| download | gentoo-2-6eed65c04a6e95161b883fc010e3706ec4c404db.tar.gz gentoo-2-6eed65c04a6e95161b883fc010e3706ec4c404db.tar.bz2 gentoo-2-6eed65c04a6e95161b883fc010e3706ec4c404db.zip | |
Update bootstrap.sh to replace STAGE1_USE with BOOTSTRAP_USE - bug 390701.
| -rwxr-xr-x | scripts/bootstrap.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 08a9b3334e24..be150cd227c5 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.93 2011/07/14 19:19:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 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.93 2011/07/14 19:19:02 zmedico Exp $" +cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 jmbsvicetto Exp $" cvsver=${cvsver##*,v } cvsver=${cvsver%%Exp*} cvsyear=${cvsver#* } @@ -304,16 +304,16 @@ export CONFIG_PROTECT="-*" # disable collision-protection export FEATURES="${FEATURES} -collision-protect" -# query STAGE1_USE from the profile -STAGE1_USE=$(portageq envvar STAGE1_USE) +# query BOOTSTRAP_USE from the profile +BOOTSTRAP_USE=$(portageq envvar BOOTSTRAP_USE) if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then show_status 2 Updating portage - ${V_ECHO} USE="-* build bootstrap ${ALLOWED_USE} ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1 + ${V_ECHO} USE="-* build bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1 echo ------------------------------------------------------------------------------- set_bootstrap_stage 2 fi -export USE="-* bootstrap ${ALLOWED_USE} ${STAGE1_USE}" +export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}" # We can't unmerge headers which may or may not exist yet. If your # trying to use nptl, it may be needed to flush out any old headers |