diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-25 10:13:34 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 15:20:02 +0000 |
| commit | 0cc3de60d6282d22108ea59f169a0749be5e59ea (patch) | |
| tree | 2bef9ed79c0b4d9e128b3095e72ccce4a525a532 /morphlib/cachekeycomputer.py | |
| parent | 84807d4d7c23f45d4f0a0f87e6c7ba7ba7470936 (diff) | |
| download | morph-0cc3de60d6282d22108ea59f169a0749be5e59ea.tar.gz | |
Add 'prefix' property for chunks within strata
Morph no longer supports setting the prefix using the --prefix
argument / setting. This was only used in tests and during bootstrap.
If a chunk build-depends on a chunk within a stratum which has
a custom prefix, that prefix is appended to the PATH in the build
environment.
Diffstat (limited to 'morphlib/cachekeycomputer.py')
| -rw-r--r-- | morphlib/cachekeycomputer.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 4573ad0d..244257a0 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -27,8 +27,8 @@ class CacheKeyComputer(object): self._calculated = {} def _filterenv(self, env): - keys = ["LOGNAME", "PREFIX", "TARGET", "TARGET_STAGE1", - "TARGET_GCC_CONFIG", "USER", "USERNAME"] + keys = ["LOGNAME", "TARGET", "TARGET_STAGE1", "TARGET_GCC_CONFIG", + "USER", "USERNAME"] return dict([(k, env[k]) for k in keys]) def compute_key(self, artifact): @@ -88,6 +88,7 @@ class CacheKeyComputer(object): kind = artifact.source.morphology['kind'] if kind == 'chunk': keys['build-mode'] = artifact.source.build_mode + keys['prefix'] = artifact.source.prefix keys['tree'] = artifact.source.tree elif kind in ('system', 'stratum'): morphology = artifact.source.morphology |