From b2debf6bee0f11892b14304667911da45688103e Mon Sep 17 00:00:00 2001
From: Daniel Robbins <drobbins@gentoo.org>
Date: Thu, 30 Oct 2003 21:11:57 +0000
Subject: [PATCH] should allow pkgcache and ccache to work for stage1 builds

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@39 d1e1f19c-881f-0410-ab34-b69fee027534
---
 catalyst                        |  3 ++-
 targets/stage1/stage1-chroot.sh | 11 ++++++++++-
 targets/stage2/stage2.sh        |  6 +-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/catalyst b/catalyst
index 46642477..aac11c42 100755
--- a/catalyst
+++ b/catalyst
@@ -25,7 +25,8 @@ if os.getuid()!=0:
 myspec={}
 #these would come from /etc/catalyst.conf:
 myspec["storedir"]="/var/tmp/catalyst"
-myspec["sharedir"]="/usr/share/catalyst"
+#myspec["sharedir"]="/usr/share/catalyst"
+myspec["sharedir"]=os.getcwd()
 #these would come from there too?:
 myspec["distdir"]="/mnt/misc/distfiles"
 myspec["portdir"]="/usr/portage"
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 6d4449be..25a89d15 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,10 +6,19 @@ case $1 in
 	build)
 		export ROOT=${2}
 		install -d $ROOT
+		if [ -n "${clst_CCACHE}" ]
+		then
+			export FEATURES="ccache"	
+			emerge --oneshot --nodeps ccache || exit 1
+		fi
+		if [ -n "${clst_PKGCACHE}" ]
+		then
+			export EMERGE_OPTS="--usepkg --buildpkg"
+		fi
 		for x in $(/tmp/build.sh)
 		do
 			echo $x >> /tmp/build.log
-			USE="-* build" emerge --usepkg --buildpkg --noreplace $x || exit 1
+			USE="-* build" emerge --noreplace $x || exit 1
 		done
 	;;
 
diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index 0c92da50..28956b38 100755
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.3 2003/10/30 06:21:08 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.4 2003/10/30 21:11:57 drobbins Exp $
 
 case $1 in
 enter)
@@ -13,10 +13,6 @@ run)
 	cat /etc/make.profile/make.defaults | grep GRP_STAGE23_USE > /tmp/stage23
 	source /tmp/stage23
 	export USE="-* \${clst_HOSTUSE} \${GRP_STAGE23_USE}"
-	echo
-	echo "USE variables active: \${USE}"
-	rm -f /tmp/stage23
-	echo
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export FEATURES="ccache"	
-- 
2.26.2