From f1cdf64cd5fa4271403286271ead511989ce15a1 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 13 Mar 2013 16:24:59 +0000 Subject: One 'arch' to rule them all Define a specific set of 4 architectures that Morph supports, and only expose that value to morphologies. Since GNU triplets are very common we also expose a GNU triplet. Other morphologies should work out their configuration based on MORPH_ARCH. This commit also removes the morphlib.util.arch() function, which detected the machine Morph is running on via 'uname -m'. Morph's architecture names do not necessarily map to the output of 'uname -m' so we should not rely on it anywhere. --- morphlib/cachekeycomputer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'morphlib/cachekeycomputer.py') diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 244257a0..6acf654b 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -27,7 +27,7 @@ class CacheKeyComputer(object): self._calculated = {} def _filterenv(self, env): - keys = ["LOGNAME", "TARGET", "TARGET_STAGE1", "TARGET_GCC_CONFIG", + keys = ["LOGNAME", "MORPH_ARCH", "TARGET", "TARGET_STAGE1", "USER", "USERNAME"] return dict([(k, env[k]) for k in keys]) @@ -79,7 +79,6 @@ class CacheKeyComputer(object): def _calculate(self, artifact): keys = { - 'arch': self._build_env.arch, 'env': self._filterenv(self._build_env.env), 'filename': artifact.source.filename, 'kids': [self.compute_key(x) for x in artifact.dependencies] -- cgit v1.2.1