Fix broken "preserve_libs" commit - ";" is not ":".
[catalyst.git] / catalyst
index a9b1109a77b948c446c75a2d5f340b2913986384..5575d7aa135823e52a1c2a03b710b4d33781e63c 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,23 +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, getopt
+import os, sys, imp, string, getopt
+import pdb
+import os.path
 
-# This assumes that our modules are in a sub-dir named "modules" in the
-# directory that the main catalyst binary is in
 __selfpath__ = os.path.abspath(os.path.dirname(__file__))
+
 sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
-import catalyst.target
-from catalyst.support import *
 
-__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.99"
+__maintainer__="Catalyst <catalyst@gentoo.org>"
+__version__="2.0.12.2"
 
 conf_values={}
 
@@ -32,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"
@@ -47,34 +50,32 @@ def usage():
        print "Using the specfile option (-f, --file) to build a stage target:"
        print "catalyst -f stage1-specfile.spec"
 
-def show_version():
+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):
        # search a couple of different areas for the main config file
-       myconf = {}
-       config_file = ""
-
-       confdefaults = {
-               "storedir": "/var/tmp/catalyst",
-               "sharedir": "/usr/share/catalyst",
-               "distdir": "/usr/portage/distfiles",
-               "portdir": "/usr/portage",
-               "options": "",
-               "snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
-               "hash_function": "crc32"
-       }
+       myconf={}
+       config_file=""
+
+       confdefaults={ "storedir":"/var/tmp/catalyst",\
+               "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\
+               "portdir":"/usr/portage","options":"",\
+               "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\
+               "hash_function":"crc32"}
 
        # first, try the one passed (presumably from the cmdline)
        if myconfig:
                if os.path.exists(myconfig):
-                       print "Using command line specified Catalyst configuration file, " + myconfig
-                       config_file = myconfig
+                       print "Using command line specified Catalyst configuration file, "+myconfig
+                       config_file=myconfig
+
                else:
-                       print "!!! catalyst: specified configuration file " + myconfig + " does not exist"
+                       print "!!! catalyst: Could not use specified configuration file "+\
+                               myconfig
                        sys.exit(1)
 
        # next, try the default location
@@ -87,13 +88,9 @@ def parse_config(myconfig):
                print "!!! catalyst: Could not find a suitable configuration file"
                sys.exit(1)
 
-       # Load the default config values into myconf
-       for x in confdefaults:
-               print "Setting " + x + " to default value \"" + confdefaults[x] + "\""
-               myconf[x] = confdefaults[x]
-
        # now, try and parse the config file "config_file"
        try:
+#              execfile(config_file, myconf, myconf)
                myconfig = catalyst.config.ConfigParser(config_file)
                myconf.update(myconfig.get_values())
 
@@ -110,29 +107,66 @@ def parse_config(myconfig):
                        print "Setting",x,"to default value \""+confdefaults[x]+"\""
                        conf_values[x]=confdefaults[x]
 
-       options = (
-               ("autoresume", "AUTORESUME", "Autoresuming support enabled."),
-               ("ccache", "CCACHE", "Compiler cache support enabled."),
-               ("clear-autoresume", "CLEAR_AUTORESUME", "Cleaning autoresume flags support enabled"),
-#              ("compress", "COMPRESS", "Compression enabled."),
-               ("distcc", "DISTCC", "Distcc support enabled."),
-               ("icecream", "ICECREAM", "Icecream compiler cluster support enabled."),
-               ("kerncache", "KERNCACHE", "Kernel cache support enabled."),
-               ("pkgcache", "PKGCACHE", "Package cache support enabled."),
-               ("purge", "PURGE", "Purge support enabled."),
-               ("seedcache", "SEEDCACHE", "Seed cache support enabled."),
-               ("snapcache", "SNAPCACHE", "Snapshot cache support enabled."),
-               ("metadata_overlay", "METADATA_OVERLAY", "Use of metadata_overlay module for portage enabled."),
-#              ("tarball", "TARBALL", "Tarball creation enabled.")
-       )
-
-       split_options = conf_values["options"].split()
-
        # parse out the rest of the options from the config file
-       for x in options:
-               if x[0] in split_options:
-                       print x[2]
-                       conf_values[x[1]] = "1"
+       if "autoresume" in string.split(conf_values["options"]):
+               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"
+
+       if "clear-autoresume" in string.split(conf_values["options"]):
+               print "Cleaning autoresume flags support enabled."
+               conf_values["CLEAR_AUTORESUME"]="1"
+
+#      if "compress" in string.split(conf_values["options"]):
+#              print "Compression enabled."
+#              conf_values["COMPRESS"]="1"
+
+       if "distcc" in string.split(conf_values["options"]):
+               print "Distcc support enabled."
+               conf_values["DISTCC"]="1"
+
+       if "icecream" in string.split(conf_values["options"]):
+               print "Icecream compiler cluster support enabled."
+               conf_values["ICECREAM"]="1"
+
+       if "kerncache" in string.split(conf_values["options"]):
+               print "Kernel cache support enabled."
+               conf_values["KERNCACHE"]="1"
+
+       if "pkgcache" in string.split(conf_values["options"]):
+               print "Package cache support enabled."
+               conf_values["PKGCACHE"]="1"
+
+       if "preserve_libs" in string.split(conf_values["options"]):
+               print "Preserving libs during unmerge."
+               conf_values["PRESERVE_LIBS"]="1"
+
+       if "purge" in string.split(conf_values["options"]):
+               print "Purge support enabled."
+               conf_values["PURGE"]="1"
+
+       if "seedcache" in string.split(conf_values["options"]):
+               print "Seed cache support enabled."
+               conf_values["SEEDCACHE"]="1"
+
+       if "snapcache" in string.split(conf_values["options"]):
+               print "Snapshot cache support enabled."
+               conf_values["SNAPCACHE"]="1"
+
+#      if "tarball" in string.split(conf_values["options"]):
+#              print "Tarball creation enabled."
+#              conf_values["TARBALL"]="1"
 
        if "digests" in myconf:
                conf_values["digests"]=myconf["digests"]
@@ -143,9 +177,48 @@ def parse_config(myconfig):
                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={}
+
+       try:
+               for x in required_build_targets:
+                       try:
+                               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["sharedir"]+"/modules/"
+
+               for x in valid_build_targets:
+                       try:
+                               fh=open(conf_values["sharedir"]+"/modules/"+x+".py")
+                               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["sharedir"]+"/modules/"
+
+       except ImportError:
+               print "!!! catalyst: Python modules not found in "+\
+                       conf_values["sharedir"]+"/modules; exiting."
+               sys.exit(1)
+
+       return targetmap
+
 def build_target(addlargs, targetmap):
        try:
-               if not addlargs["target"] in targetmap:
+               if addlargs["target"] not in targetmap:
                        raise CatalystError,"Target \""+addlargs["target"]+"\" not available."
 
                mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
@@ -155,60 +228,25 @@ def build_target(addlargs, targetmap):
        except:
                catalyst.util.print_traceback()
                print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
-#              sys.exit(1)
-               raise
-
-def verify_digest_and_hash_functions():
-       # 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 i in hash_map:
-                               print
-                               print i+" is not a valid digest entry"
-                               print "Valid digest entries:"
-                               print hash_map.keys()
-                               print
-                               print "Catalyst aborting...."
-                               sys.exit(2)
-                       if find_binary(hash_map[i][1]) == None:
-                               print
-                               print "digest="+i
-                               print "\tThe "+hash_map[i][1]+\
-                                       " binary was not found. It needs to be in your system path"
-                               print
-                               print "Catalyst aborting...."
-                               sys.exit(2)
-
-       if "hash_function" in conf_values:
-               if not conf_values["hash_function"] in hash_map:
-                       print
-                       print conf_values["hash_function"]+" is not a valid hash_function entry"
-                       print "Valid hash_function entries:"
-                       print hash_map.keys()
-                       print
-                       print "Catalyst aborting...."
-                       sys.exit(2)
-               if find_binary(hash_map[conf_values["hash_function"]][1]) == None:
-                       print
-                       print "hash_function="+conf_values["hash_function"]
-                       print "\tThe "+hash_map[conf_values["hash_function"]][1]+\
-                               " binary was not found. It needs to be in your system path"
-                       print
-                       print "Catalyst aborting...."
-                       sys.exit(2)
+               sys.exit(1)
 
 if __name__ == "__main__":
+       targetmap={}
 
-       show_version()
-
+       version()
        if os.getuid() != 0:
                # catalyst cannot be run as a normal user due to chroots, mounts, etc
                print "!!! catalyst: This script requires root privileges to operate"
                sys.exit(2)
 
+       # we need some options in order to work correctly
+       if len(sys.argv) < 2:
+               usage()
+               sys.exit(2)
+
        # 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:
@@ -280,6 +318,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"
 
@@ -288,11 +329,52 @@ if __name__ == "__main__":
                usage()
                sys.exit(2)
 
+       # import configuration file and import our main module using those settings
        parse_config(myconfig)
+       sys.path.append(conf_values["sharedir"]+"/modules")
+       from catalyst_support import *
 
-       verify_digest_and_hash_functions()
+       # 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 i not in hash_map:
+                               print
+                               print i+" is not a valid digest entry"
+                               print "Valid digest entries:"
+                               print hash_map.keys()
+                               print
+                               print "Catalyst aborting...."
+                               sys.exit(2)
+                       if find_binary(hash_map[i][1]) == None:
+                               print
+                               print "digest="+i
+                               print "\tThe "+hash_map[i][1]+\
+                                       " binary was not found. It needs to be in your system path"
+                               print
+                               print "Catalyst aborting...."
+                               sys.exit(2)
+       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 "Valid hash_function entries:"
+                       print hash_map.keys()
+                       print
+                       print "Catalyst aborting...."
+                       sys.exit(2)
+               if find_binary(hash_map[conf_values["hash_function"]][1]) == None:
+                       print
+                       print "hash_function="+conf_values["hash_function"]
+                       print "\tThe "+hash_map[conf_values["hash_function"]][1]+\
+                               " binary was not found. It needs to be in your system path"
+                       print
+                       print "Catalyst aborting...."
+                       sys.exit(2)
 
-       targetmap = catalyst.target.build_target_map()
+       # import the rest of the catalyst modules
+       targetmap=import_modules()
 
        addlargs={}
 
@@ -309,7 +391,7 @@ if __name__ == "__main__":
                        print "!!! catalyst: Could not parse commandline, exiting."
                        sys.exit(1)
 
-       if not "target" in addlargs:
+       if "target" not in addlargs:
                raise CatalystError, "Required value \"target\" not specified."
 
        # everything is setup, so the build is a go
@@ -320,22 +402,23 @@ if __name__ == "__main__":
                print
                print "Catalyst aborting...."
                sys.exit(2)
-
        except KeyboardInterrupt:
                print "\nCatalyst build aborted due to user interrupt ( Ctrl-C )"
                print
                print "Catalyst aborting...."
                sys.exit(2)
-
        except LockInUse:
                print "Catalyst aborting...."
                sys.exit(2)
-
        except:
                print "Catalyst aborting...."
                raise
                sys.exit(2)
 
+       #except CatalystError:
+       #       print
+       #       print "Catalyst aborting...."
+       #       sys.exit(2)
        #except KeyError:
        #       print "\nproblem with command line or spec file ( Key Error )"
        #       print "Key: "+str(sys.exc_value)+" was not found"