diff options
| -rw-r--r-- | morphlib/morphloader.py | 5 | ||||
| -rw-r--r-- | morphlib/morphloader_tests.py | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 144afe96..fef56ca3 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -514,11 +514,6 @@ class MorphologyLoader(object): raise DuplicateStratumError(morph['name'], name) names.add(name) - # We allow the ARMv7 little-endian architecture to be specified - # as armv7 and armv7l. Normalise. - if morph['arch'] == 'armv7': - morph['arch'] = 'armv7l' - # Architecture name must be known. if morph['arch'] not in morphlib.valid_archs: raise UnknownArchitectureError(morph['arch'], morph.filename) diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py index 1a75b51a..4500a563 100644 --- a/morphlib/morphloader_tests.py +++ b/morphlib/morphloader_tests.py @@ -342,17 +342,6 @@ chunks: morphlib.morphloader.UnknownArchitectureError, self.loader.validate, m) - def test_validate_normalises_architecture_armv7_to_armv7l(self): - m = morphlib.morphology.Morphology( - kind="system", - name="foo", - arch="armv7", - strata=[ - {'morph': 'bar'}, - ]) - self.loader.validate(m) - self.assertEqual(m['arch'], 'armv7l') - def test_validate_requires_build_deps_or_bootstrap_mode_for_strata(self): m = stratum_template("stratum-no-bdeps-no-bootstrap") |