livecd-stage2 fixes, ccache now works for genkernel; see ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index acfff4edd089111acff51d94c65ca9a191fe6f15..d206b04861ffc22d3f83968f103d83131b2542e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.17 2004/02/11 19:12:07 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.18 2004/02/13 02:41:26 drobbins Exp $
 
+  12 Feb 2004; Daniel Robbins <drobbins@gentoo.org>: fixed bugs in previous
+  feature additions (see 11 Feb 2004) and added support for a $clst_conf 
+  environment variable. You can use the $clst_conf variable to point to
+  a file to use in place of /etc/catalyst.conf. By setting this variable
+  in your shell, catalyst can easily be used by multiple people on the
+  same machine. Also, ccache support now works for genkernel.
+  
   11 Feb 2004; Daniel Robbins <drobbins@gentoo.org>: removed file for
   livecd-stage2 target, as this is handled by the runscript now. Added support
   for "/boot/kernel/foo/use", "/boot/kernel/foo/packages," and made

diff --git a/examples/livecd/runscript/default-runscript.sh b/examples/livecd/runscript/default-runscript.sh
index 908b784fda8612c2b9abff5e9117a1833d7e500d..d75879b5045213e025a87bffee5ad401fe21f20e 100644 (file)
--- a/examples/livecd/runscript/default-runscript.sh
+++ b/examples/livecd/runscript/default-runscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/default-runscript.sh,v 1.13 2004/02/11 19:12:07 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/default-runscript.sh,v 1.14 2004/02/13 02:41:26 drobbins Exp $
 
 #return codes to be used by archscript
 
@@ -110,22 +110,26 @@ EOF
                                        # Append Extraversion
                                        sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextversion}:" /usr/src/linux/Makefile
                                fi
+                               if [ -n "${clst_CCACHE}" ]
+                               then
+                                       #enable ccache for genkernel
+                                       export PATH="/usr/lib/ccache/bin:\${PATH}"
+                               fi
                                genkernel ${genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/$clst_kname.config --minkernpackage=/tmp/binaries/$clst_kname.tar.bz2 all || exit 1
                                #now we merge any kernel-dependent packages
                                if [ -e /var/tmp/$clst_kname.packages ]
                                then
-                                       for x in "\$( cat /var/tmp/$clst_kname.packages )"
+                                       for x in \$( cat /var/tmp/$clst_kname.packages )
                                        do
                                                # we don't want to use the pkgcache for these since the results
                                                # are kernel-dependent.
+                                               echo DEBUG emerge "\$x"
                                                emerge "\$x"
                                        done
                                fi
-                               cd /usr/src/linux
-                               #mrproper cleans out the tree and allows full unmerging of all subdirs
-                               make mrproper
                                cd /usr/src
-                               #now the unmerge...
+                               rm -rf linux*
+                               #now the unmerge... (wipe db entry)
                                emerge -C $clst_ksource
                                unset USE
 EOF

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 829cb311e7cb72adcb98f1cbce1b5a3fbdcecc5f..0315978c9b36d60a22a4c74ed40ab8ddf9abe671 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.16 2004/02/12 19:51:37 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.17 2004/02/13 02:41:26 drobbins Exp $
 
 import sys,string,os,types
 
@@ -165,13 +165,11 @@ def ismount(path):
 def arg_parse(mydict,remaining,argv):
        "grab settings from argv, storing 'target' in mydict, and everything in remaining for later parsing"
        global required_config_file_values
-       print "ARGV",argv
        for x in argv:
                foo=string.split(x,"=")
                if len(foo)!=2:
                        raise CatalystError, "Invalid arg syntax: "+x
                remaining[foo[0]]=foo[1]
-               print "X",x
        if not remaining.has_key("target"):
                raise CatalystError, "Required value \"target\" not specified."
        mydict["target"]=remaining["target"]

diff --git a/modules/targets.py b/modules/targets.py
index 9ec3104f9ffe8dab7c575cf31f7afd122d496faa..1aedeeb2ddf3798b2646ad17c6f703145c6ef01c 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.86 2004/02/12 19:51:37 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.87 2004/02/13 02:41:26 drobbins Exp $
 
 import os,string,imp,types,shutil
 from catalyst_support import *
@@ -541,6 +541,7 @@ class livecd_stage2_target(generic_stage_target):
                        #write out /var/tmp/kname.(use|packages) files, used for kernel USE and extra packages settings
                        for extra in ["use","packages"]:
                                if self.settings.has_key("boot/kernel/"+kname+"/"+extra):
+                                       print "DEBUG: has key boot/kernel/"+kname+"/"+extra,self.settings["boot/kernel/"+kname+"/"+extra]
                                        myex=self.settings["boot/kernel/"+kname+"/"+extra]
                                        if type(myex)==types.ListType:
                                                myex=string.join(myex)
@@ -553,7 +554,10 @@ class livecd_stage2_target(generic_stage_target):
                                                myf.write("export USE=\""+myex+"\"\n")
                                        else:
                                                myf.write(myex+"\n")
-                                       myf.close
+                                       myf.close()
+                               else:
+                                       print "DEBUG: no key boot/kernel/"+kname+"/"+extra
+                                       
 
                        retval=os.system("cp "+self.settings["boot/kernel/"+kname+"/config"]+" "+self.settings["chroot_path"]+"/var/tmp/"+kname+".config")
                        if retval!=0: