generic_stage_target.py: Dedent the bulk of ._build_kernel()
[catalyst.git] / catalyst
index 9883485a2049c383d4bdeb0ab55db0e11e0394e7..9f8dd30127c7c7fbdf2803e43eda90ae213e7467 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,19 +1,25 @@
 #!/usr/bin/python -OO
 
 # Maintained in full by:
+# Catalyst Team <catalyst@gentoo.org>
+# Release Engineering Team <releng@gentoo.org>
 # Andrew Gaffney <agaffney@gentoo.org>
-# Chris Gianelloni <wolf31o2@gentoo.org>
+# Chris Gianelloni <wolf31o2@wolf31o2.org>
+# $Id$
 
-import os,sys,imp,string,getopt
+import os, sys, imp, string, getopt
 import pdb
+import os.path
 
-sys.path.append("./modules")
+__selfpath__ = os.path.abspath(os.path.dirname(__file__))
+
+sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
 
-__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6.901"
+__maintainer__="Catalyst <catalyst@gentoo.org>"
+__version__="2.0.12.2"
 
 conf_values={}
 
@@ -28,6 +34,7 @@ def usage():
        print " -h --help       print this help message"
        print " -p --purge      clear tmp dirs,package cache and autoresume flags"
        print " -P --purgeonly  clear tmp dirs,package cache and autoresume flags and exit"
+       print " -T --purgetmponly  clear tmp dirs and autoresume flags and exit"
        print " -s --snapshot   generate a release snapshot"
        print " -V --version    display version information"
        print " -v --verbose    verbose output"
@@ -46,7 +53,7 @@ def usage():
 def version():
        print "Catalyst, version "+__version__
        print "Copyright 2003-2008 Gentoo Foundation"
-       print "Copyright 2008 various authors"
+       print "Copyright 2008-2012 various authors"
        print "Distributed under the GNU General Public License version 2.1\n"
 
 def parse_config(myconfig):
@@ -93,7 +100,7 @@ def parse_config(myconfig):
        
        # now, load up the values into conf_values so that we can use them
        for x in confdefaults.keys():
-               if myconf.has_key(x):
+               if x in myconf:
                        print "Setting",x,"to config file value \""+myconf[x]+"\""
                        conf_values[x]=myconf[x]
                else:
@@ -105,6 +112,14 @@ def parse_config(myconfig):
                print "Autoresuming support enabled."
                conf_values["AUTORESUME"]="1"
 
+       if "bindist" in string.split(conf_values["options"]):
+               print "Binary redistribution enabled"
+               conf_values["BINDIST"]="1"
+       else:
+               print "Bindist is not enabled in catalyst.conf"
+               print "Binary redistribution of generated stages/isos may be prohibited by law."
+               print "Please see the use description for bindist on any package you are including."
+
        if "ccache" in string.split(conf_values["options"]):
                print "Compiler cache support enabled."
                conf_values["CCACHE"]="1"
@@ -145,23 +160,25 @@ def parse_config(myconfig):
                print "Snapshot cache support enabled."
                conf_values["SNAPCACHE"]="1"
 
-       if "metadata_overlay" in conf_values["options"].split():
-               print "Use of metadata_overlay module for portage enabled."
-               conf_values["METADATA_OVERLAY"]="1"
-
 #      if "tarball" in string.split(conf_values["options"]):
 #              print "Tarball creation enabled."
 #              conf_values["TARBALL"]="1"
 
-       if myconf.has_key("digests"):
+       if "digests" in myconf:
                conf_values["digests"]=myconf["digests"]
-       if myconf.has_key("contents"):
+       if "contents" in myconf:
                conf_values["contents"]=myconf["contents"]
 
-       if myconf.has_key("envscript"):
+       if "envscript" in myconf:
                print "Envscript support enabled."
                conf_values["ENVSCRIPT"]=myconf["envscript"]
 
+       if "var_tmpfs_portage" in myconf:
+               conf_values["var_tmpfs_portage"]=myconf["var_tmpfs_portage"];
+
+       if "port_logdir" in myconf:
+               conf_values["port_logdir"]=myconf["port_logdir"];
+
 def import_modules():
        # import catalyst's own modules (i.e. catalyst_support and the arch modules)
        targetmap={}
@@ -172,10 +189,10 @@ def import_modules():
                                fh=open(conf_values["sharedir"]+"/modules/"+x+".py")
                                module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE))
                                fh.close()
-               
+
                        except IOError:
                                raise CatalystError,"Can't find "+x+".py plugin in "+\
-                                       conf_values.settings["sharedir"]+"/modules/"
+                                       conf_values["sharedir"]+"/modules/"
 
                for x in valid_build_targets:
                        try:
@@ -183,10 +200,10 @@ def import_modules():
                                module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE))
                                module.register(targetmap)
                                fh.close()
-               
+
                        except IOError:
                                raise CatalystError,"Can't find "+x+".py plugin in "+\
-                                       conf_values.settings["sharedir"]+"/modules/"
+                                       conf_values["sharedir"]+"/modules/"
 
        except ImportError:
                print "!!! catalyst: Python modules not found in "+\
@@ -197,7 +214,7 @@ def import_modules():
 
 def build_target(addlargs, targetmap):
        try:
-               if not targetmap.has_key(addlargs["target"]):
+               if addlargs["target"] not in targetmap:
                        raise CatalystError,"Target \""+addlargs["target"]+"\" not available."
                
                mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
@@ -225,7 +242,7 @@ if __name__ == "__main__":
 
        # parse out the command line arguments
        try:
-               opts,args = getopt.getopt(sys.argv[1:], "apPhvdc:C:f:FVs:", ["purge", "purgeonly", "help", "version", "debug",\
+               opts,args = getopt.getopt(sys.argv[1:], "apPThvdc:C:f:FVs:", ["purge", "purgeonly", "purgetmponly", "help", "version", "debug",\
                        "clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
        
        except getopt.GetoptError:
@@ -247,7 +264,7 @@ if __name__ == "__main__":
                usage()
                sys.exit(2)
 
-       run = false
+       run = False
        for o, a in opts:
                if o in ("-h", "--help"):
                        usage()
@@ -265,14 +282,14 @@ if __name__ == "__main__":
                        myconfig=a
 
                if o in ("-C", "--cli"):
-                       run = true
+                       run = True
                        x=sys.argv.index(o)+1
                        while x < len(sys.argv):
                                mycmdline.append(sys.argv[x])
                                x=x+1
                        
                if o in ("-f", "--file"):
-                       run = true
+                       run = True
                        myspecfile=a
 
                if o in ("-F", "--fetchonly"):
@@ -287,7 +304,7 @@ if __name__ == "__main__":
                                usage()
                                sys.exit(2)
                        else:
-                               run = true
+                               run = True
                                mycmdline.append("target=snapshot")
                                mycmdline.append("version_stamp="+a)
                
@@ -297,6 +314,9 @@ if __name__ == "__main__":
                if o in ("-P", "--purgeonly"):
                        conf_values["PURGEONLY"] = "1"
 
+               if o in ("-T", "--purgetmponly"):
+                       conf_values["PURGETMPONLY"] = "1"
+
                if o in ("-a", "--clear-autoresume"):
                        conf_values["CLEAR_AUTORESUME"] = "1"
 
@@ -310,10 +330,11 @@ if __name__ == "__main__":
        sys.path.append(conf_values["sharedir"]+"/modules")
        from catalyst_support import *
        
-       # Start checking that digests are valid now that the hash_map was imported from catalyst_support
-       if conf_values.has_key("digests"):
+       # Start checking that digests are valid now that the hash_map was imported
+       # from catalyst_support
+       if "digests" in conf_values:
                for i in conf_values["digests"].split():
-                       if not hash_map.has_key(i):
+                       if i not in hash_map:
                                print
                                print i+" is not a valid digest entry"
                                print "Valid digest entries:"
@@ -329,10 +350,11 @@ if __name__ == "__main__":
                                print
                                print "Catalyst aborting...."
                                sys.exit(2)
-       if conf_values.has_key("hash_function"):
-               if not hash_map.has_key(conf_values["hash_function"]):
+       if "hash_function" in conf_values:
+               if conf_values["hash_function"] not in hash_map:
                        print
-                       print conf_values["hash_function"]+" is not a valid hash_function entry"
+                       print conf_values["hash_function"]+\
+                               " is not a valid hash_function entry"
                        print "Valid hash_function entries:"
                        print hash_map.keys()
                        print
@@ -365,7 +387,7 @@ if __name__ == "__main__":
                        print "!!! catalyst: Could not parse commandline, exiting."
                        sys.exit(1)
 
-       if not addlargs.has_key("target"):
+       if "target" not in addlargs:
                raise CatalystError, "Required value \"target\" not specified."
 
        # everything is setup, so the build is a go