diff options
| -rw-r--r-- | morphlib/artifactresolver_tests.py | 2 | ||||
| -rw-r--r-- | morphlib/cachedir_tests.py | 6 | ||||
| -rw-r--r-- | morphlib/morphologyfactory.py | 2 | ||||
| -rw-r--r-- | morphlib/morphologyfactory_tests.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/morphlib/artifactresolver_tests.py b/morphlib/artifactresolver_tests.py index 5510b1cf..b685902e 100644 --- a/morphlib/artifactresolver_tests.py +++ b/morphlib/artifactresolver_tests.py @@ -212,7 +212,7 @@ class ArtifactResolverTests(unittest.TestCase): { "name": "foo", "kind": "system", - "arch": "arm" + "arch": "armv7" } ''') morph.builds_artifacts = ['foo-rootfs', 'foo-kernel'] diff --git a/morphlib/cachedir_tests.py b/morphlib/cachedir_tests.py index 43686427..f02f80e1 100644 --- a/morphlib/cachedir_tests.py +++ b/morphlib/cachedir_tests.py @@ -71,7 +71,7 @@ class CacheDirTests(unittest.TestCase): 'kind': 'chunk', 'ref': 'DEADBEEF', 'repo': 'git://git.baserock.org/hello/', - 'arch': 'armel', + 'arch': 'armv7', } pathname = self.cachedir.name(dict_key) self.assert_(pathname.startswith(self.cachedir.dirname + '/')) @@ -82,7 +82,7 @@ class CacheDirTests(unittest.TestCase): 'kind': 'stratum', 'ref': 'DEADBEEF', 'repo': 'git://git.baserock.org/hello/', - 'arch': 'armel', + 'arch': 'armv7', } pathname = self.cachedir.name(dict_key) self.assert_(pathname.startswith(self.cachedir.dirname + '/')) @@ -92,7 +92,7 @@ class CacheDirTests(unittest.TestCase): dict_key = { 'ref': 'DEADBEEF', 'repo': 'git://git.baserock.org/hello/', - 'arch': 'armel', + 'arch': 'armv7', } pathname = self.cachedir.name(dict_key) self.assert_(pathname.startswith(self.cachedir.dirname + '/')) diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py index 69b47507..64022394 100644 --- a/morphlib/morphologyfactory.py +++ b/morphlib/morphologyfactory.py @@ -96,7 +96,7 @@ class MorphologyFactory(object): '(it is a mandatory field)' % filename) name = morphology['name'] - if morphology['arch'] == 'arm': + if morphology['arch'] == 'armv7': morphology.builds_artifacts = [name + '-kernel', name + '-rootfs'] else: # FIXME: -rootfs is a misnomer, should be -disk, but can't diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py index 8b69f1de..b8c89d2a 100644 --- a/morphlib/morphologyfactory_tests.py +++ b/morphlib/morphologyfactory_tests.py @@ -218,7 +218,7 @@ class MorphologyFactoryTests(unittest.TestCase): self.assertEqual(morph.builds_artifacts, ['foo-system-rootfs']) def test_sets_builds_artifacts_for_arm_system(self): - self.lr.arch = 'arm' + self.lr.arch = 'armv7' morph = self.mf.get_morphology('reponame', 'sha1', 'system.morph') self.assertEqual(sorted(morph.builds_artifacts), sorted(['foo-system-rootfs', 'foo-system-kernel'])) |