| 1 |
commit: f716556e688ab2fae515485ed675f45904e1a334 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 20 00:07:15 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Dec 31 03:58:32 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f716556e |
| 7 |
|
| 8 |
Set mountmap["icecream"] from settings for now. |
| 9 |
|
| 10 |
“mountmap” is for source paths. “mounts” is for path-agnostic keys. |
| 11 |
I plan to add a source_mounts to settings later to compliment the target_mounts paths. |
| 12 |
|
| 13 |
--- |
| 14 |
catalyst | 1 + |
| 15 |
modules/generic_stage_target.py | 4 ++-- |
| 16 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/catalyst b/catalyst |
| 19 |
index 82b0942..cb6c022 100755 |
| 20 |
--- a/catalyst |
| 21 |
+++ b/catalyst |
| 22 |
@@ -66,6 +66,7 @@ def parse_config(myconfig): |
| 23 |
confdefaults = { |
| 24 |
"distdir": "/usr/portage/distfiles", |
| 25 |
"hash_function": "crc32", |
| 26 |
+ "icecream": "/var/cache/icecream", |
| 27 |
"local_overlay": "/usr/local/portage", |
| 28 |
"options": "", |
| 29 |
"packagedir": "/usr/portage/packages", |
| 30 |
|
| 31 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 32 |
index 8d98e58..bbea57a 100644 |
| 33 |
--- a/modules/generic_stage_target.py |
| 34 |
+++ b/modules/generic_stage_target.py |
| 35 |
@@ -249,8 +249,8 @@ class generic_stage_target(generic_target): |
| 36 |
self.env["CCACHE_DIR"] = self.target_mounts["ccache"] |
| 37 |
|
| 38 |
if "ICECREAM" in self.settings: |
| 39 |
- self.mounts.append("/var/cache/icecream") |
| 40 |
- self.mountmap["/var/cache/icecream"]="/var/cache/icecream" |
| 41 |
+ self.mounts.append("icecream") |
| 42 |
+ self.mountmap["icecream"] = self.settings["icecream"] |
| 43 |
self.env["PATH"] = self.target_mounts["icecream"] + ":" + \ |
| 44 |
self.env["PATH"] |
Archives