diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-04-04 17:48:33 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-04-04 17:48:33 +0000 |
| commit | c06264e33062e9889a07b8dc2c28d2286a21b7b4 (patch) | |
| tree | 4ff1a15fa4f0ddec529a43696c2f1d4c6fe5c3c7 /targets/stage2/stage2-chroot.sh | |
| parent | Added /usr/portage as tmpfs (this will be made conditional later). (diff) | |
| download | catalyst-c06264e33062e9889a07b8dc2c28d2286a21b7b4.tar.gz catalyst-c06264e33062e9889a07b8dc2c28d2286a21b7b4.tar.bz2 catalyst-c06264e33062e9889a07b8dc2c28d2286a21b7b4.zip | |
Initial import of Catalyst 2.0.0
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@573 d1e1f19c-881f-0410-ab34-b69fee027534
Diffstat (limited to 'targets/stage2/stage2-chroot.sh')
| -rwxr-xr-x | targets/stage2/stage2-chroot.sh | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 866348e9..32a443ac 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -1,42 +1,19 @@ #!/bin/sh # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.10 2005/01/11 14:10:19 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.11 2005/04/04 17:48:33 rocket Exp $ -/usr/sbin/env-update -source /etc/profile +. /tmp/chroot-functions.sh -[ -f /tmp/envscript ] && source /tmp/envscript +update_env_settings -if [ -n "${clst_CCACHE}" ] -then - export clst_myfeatures="${clst_myfeatures} ccache" - emerge -b -k --oneshot --nodeps ccache || exit 1 -fi - -if [ -n "${clst_DISTCC}" ] -then - export clst_myfeatures="${clst_myfeatures} distcc" - export DISTCC_HOSTS="${clst_distcc_hosts}" - - USE="-gnome -gtk" emerge -b -k --oneshot --nodeps distcc || exit 1 -fi - -if [ -n "${clst_PKGCACHE}" ] -then - export bootstrap_opts="-r" -fi - -if [ -n "${clst_FETCH}" ] -then - export bootstrap_opts="-f" -fi - -GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" +setup_myfeatures +setup_myemergeopts ## setup the environment export FEATURES="${clst_myfeatures}" +GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" ## START BUILD /usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 |