Add archdir to settings

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 005687d65b6304b787e7dfd6a8612a14caa5d8a4..e907de63132e8c36532f4e7417d12e4dff1edfa0 100644 (file)
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -63,7 +63,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
                self.archmap = {}
                self.subarchmap = {}
                machinemap = {}
-               arch_dir = self.settings["PythonDir"] + "/arch/"
+               arch_dir = self.settings["archdir"] + "/"
                for x in [x[:-3] for x in os.listdir(arch_dir) if x.endswith(".py") and x != "__init__.py"]:
                        try:
                                fh=open(arch_dir + x + ".py")
@@ -71,7 +71,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
                                This next line loads the plugin as a module and assigns it to
                                archmap[x]
                                """
-                               self.archmap[x]=imp.load_module(x,fh,"../arch/" + x + ".py",
+                               self.archmap[x]=imp.load_module(x,fh, arch_dir + x + ".py",
                                        (".py", "r", imp.PY_SOURCE))
                                """
                                This next line registers all the subarches supported in the

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index dc51667a4621269a9d4cfc6326522940ba7a4e26..d91b06d3943e9abe8c61e4c3c52b42763b474126 100644 (file)
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -58,6 +58,7 @@ contents_definitions = {
 
 
 confdefaults = {
+       "archdir": "%(PythonDir)s/arch",
        "distdir": "/usr/portage/distfiles",
        "hash_function": "crc32",
        "local_overlay": "/usr/local/portage",
@@ -65,6 +66,7 @@ confdefaults = {
        "options": set(),
        "packagedir": "/usr/portage/packages",
        "portdir": "/usr/portage",
+       "PythonDir": "./catalyst",
        "repo_name": "portage",
        "sharedir": "/usr/share/catalyst",
        "shdir": "/usr/lib/catalyst/targets/",