Commented ccache for genkernel build which will resolve #117648 until a proper soluti...

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

diff --git a/ChangeLog b/ChangeLog
index 7fd1a21edcfd191463d73a927ab02dee0c4b3253..f527be1e4228dba58d2949739c12b2a9d083e554 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.497 2006/01/04 19:51:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.498 2006/01/04 20:28:23 wolf31o2 Exp $
+
+  04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/kmerge.sh:
+  Commented ccache for genkernel build which will resolve #117648 until a
+  proper solution can be found. This is 2.0_rc13.
 
   04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-controller.sh:

diff --git a/catalyst b/catalyst
index 3d266e1fed8f4d570e4c5a6d27bcec04b291249b..1f9972b1c629b5c07a4b22c275a28d0be48e082a 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.120 2005/12/21 21:03:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.121 2006/01/04 20:28:23 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc12"
+__version__="2.0_rc13"
 
 conf_values={}
 

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index afa3fe3292d669bedf459c112ee36aa03535cc13..38c2b5bfc2e129855046a0673b77ef0f7b114f25 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