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

diff --git a/catalyst b/catalyst
index 4664247711dad62e08a8c608e1b074d7f5a338f5..aac11c42f54a3ee7afef28230073296e478c1860 100755 (executable)
--- 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 6d4449be82412944a02054b6ac8d3bbfc87d9952..25a89d156e01d1c0c310e83e15614820cd7631f6 100755 (executable)
--- 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 0c92da506e6cdd745a4359015b81082c1eb052b7..28956b38b657a1ba56fa94596d517f69133a1eb7 100755 (executable)
--- 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"