Set mountmap["icecream"] from settings for now.

“mountmap” is for source paths.  “mounts” is for path-agnostic keys.
I plan to add a source_mounts to settings later to compliment the target_mounts paths.

diff --git a/catalyst b/catalyst
index 82b094227b14ebdf780b914c9831018abb404ad0..cb6c02265a22ac9de37daf58130915361776066b 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
        confdefaults = {
                "distdir": "/usr/portage/distfiles",
                "hash_function": "crc32",
+               "icecream": "/var/cache/icecream",
                "local_overlay": "/usr/local/portage",
                "options": "",
                "packagedir": "/usr/portage/packages",

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 63a8ff5a8623c162c47d708a8d30c7136a18d027..7919f072f69d1bfcc43c43d747e984253fcaddfe 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -250,8 +250,8 @@ class generic_stage_target(generic_target):
                        self.env["CCACHE_DIR"] = self.target_mounts["ccache"]
 
                if "ICECREAM" in self.settings:
-                       self.mounts.append("/var/cache/icecream")
-                       self.mountmap["/var/cache/icecream"]="/var/cache/icecream"
+                       self.mounts.append("icecream")
+                       self.mountmap["icecream"] = self.settings["icecream"]
                        self.env["PATH"] = self.target_mounts["icecream"] + ":" + \
                                self.env["PATH"]