summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-12 11:43:23 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-12-21 10:48:49 (GMT)
commit6633cfd90eba8aa232f3ddaf778ab31362cb64da (patch)
tree6676a2c27a4056c4248d54d8533da4b4002b5e28
parent740609fe194e0be2a8dc7ceab4872f62920f716f (diff)
downloadmorph-6633cfd90eba8aa232f3ddaf778ab31362cb64da.tar.gz
morphloader: remove arch normalization
It is a non-documented secret sauce and having to type an extra letter for the ARMv7 little-endian architecture does not justify it. Change-Id: I733d1b5a5a5a53ed4dd9815d16b946f9b0a980ec
-rw-r--r--morphlib/morphloader.py5
-rw-r--r--morphlib/morphloader_tests.py11
2 files changed, 0 insertions, 16 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index 144afe9..fef56ca 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 1a75b51..4500a56 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")