diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-07 16:59:50 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-07 16:59:50 +0000 |
| commit | 347dfc39c2d897a871b51af237797a2bc43a8439 (patch) | |
| tree | 4cefc8e66bb0a36111a18c7d2b189db0332e747f | |
| parent | fix bug 98165. Change the separator on rcadd/rcdel from : to | This will im... (diff) | |
| download | gentoo-347dfc39c2d897a871b51af237797a2bc43a8439.tar.gz gentoo-347dfc39c2d897a871b51af237797a2bc43a8439.tar.bz2 gentoo-347dfc39c2d897a871b51af237797a2bc43a8439.zip | |
Removed GRP_STAGE23_USE from stages 2 and 3 and clean up unnecessary portage merge in stage3.
| -rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
| -rw-r--r-- | src/catalyst/targets/stage2/stage2-chroot.sh | 5 | ||||
| -rw-r--r-- | src/catalyst/targets/stage3/stage3-chroot.sh | 10 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 02de5a32bc..45cbbc53a0 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.79 2005/07/07 14:25:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.80 2005/07/07 16:59:50 wolf31o2 Exp $ + + 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: + Removed GRP_STAGE23_USE from stages 2 and 3 and clean up unnecessary portage + merge in stage3. 07 Jul 2005; Eric Edgar <rocket@gentoo.org> livecd/runscript-support/livecdfs-update.sh: diff --git a/src/catalyst/targets/stage2/stage2-chroot.sh b/src/catalyst/targets/stage2/stage2-chroot.sh index a401181e4c..49586aa882 100644 --- a/src/catalyst/targets/stage2/stage2-chroot.sh +++ b/src/catalyst/targets/stage2/stage2-chroot.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/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.10.2.3 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.10.2.4 2005/07/07 16:59:50 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -32,9 +32,6 @@ then export bootstrap_opts="-f" fi -GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" - - ## setup the environment export FEATURES="${clst_myfeatures}" diff --git a/src/catalyst/targets/stage3/stage3-chroot.sh b/src/catalyst/targets/stage3/stage3-chroot.sh index f203be2f20..68c1348741 100644 --- a/src/catalyst/targets/stage3/stage3-chroot.sh +++ b/src/catalyst/targets/stage3/stage3-chroot.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/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.2 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.3 2005/07/07 16:59:50 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -41,18 +41,12 @@ then export clst_myemergeopts="${clst_myemergeopts} -f" fi -GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" - # setup the build environment export FEATURES="${clst_myfeatures}" -export USE="-* ${clst_HOSTUSE} ${GRP_STAGE23_USE}" +export USE="-* ${clst_HOSTUSE}" export CONFIG_PROTECT="-*" ## START BUILD -# portage needs to be merged manually with USE="build" set to avoid frying our -# make.conf. emerge system could merge it otherwise. -USE="build" emerge --oneshot --nodeps portage - if [ -n "${clst_VERBOSE}" ] then emerge -e ${clst_myemergeopts} -vp system || exit 1 |