Fix for ccache (null)/.ccache bug

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1019 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 502545ddced106e744cd5eb5b158be1b07c3b5db..19400c61fd2fb551ebcbf32d99ce5517c15ff8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.504 2006/01/13 14:54:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.505 2006/01/13 15:00:04 rocket Exp $
+
+  13 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/generic_stage_target.py,
+  targets/support/kmerge.sh:
+  Fix for ccache (null)/.ccache bug
 
   13 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst:
   This is 2.0_rc14.

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index cfde139a89103b254c2a1ceb51b8f4af2f7dbc1e..b6522ffea622130023e379e449b58f1de3c4d24a 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.114 2006/01/10 19:52:46 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.115 2006/01/13 15:00:04 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -190,7 +190,7 @@ class generic_stage_target(generic_target):
                        self.mounts.append("/var/tmp/ccache")
                        self.mountmap["/var/tmp/ccache"]=ccdir
                        # for the chroot:
-                       os.environ["CCACHE_DIR"]="/var/tmp/ccache"      
+                       self.env["CCACHE_DIR"]="/var/tmp/ccache"        
        
        def override_chost(self):
                #if os.environ.has_key("CHOST"):

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ee35b6826c13ed3080d01bc9889411fc7a83b4ca..588a8197a9d82f08a537de8d2caf31081e91708f 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -34,10 +34,10 @@ setup_gk_args() {
        then
                GK_ARGS="${GK_ARGS} --initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}"
        fi
-#      if [ -n "${clst_CCACHE}" ]
-#      then
-#              GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc"
-#      fi
+       if [ -n "${clst_CCACHE}" ]
+       then
+               GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc"
+       fi
        
        if [ "${clst_devmanager}" == "devfs" ]
        then