From f61c65ed8dbe618f19733e9e6f1ef6b037716cf8 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Thu, 12 Nov 2015 11:43:23 +0000 Subject: morphloader: remove arch normalization Remove this secret sauce that appears to not be documented anywhere. Change-Id: I733d1b5a5a5a53ed4dd9815d16b946f9b0a980ec --- morphlib/morphloader.py | 7 +------ morphlib/morphloader_tests.py | 11 ----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index bdbabe46..691c1748 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -389,7 +389,7 @@ class MorphologyLoader(object): morphlib.buildsystem.ManualBuildSystem() def load_from_string(self, string, - filename='string'): # pragma: no cover + filename='string'): '''Load a morphology from a string. Return the Morphology object. @@ -495,11 +495,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 50fa765f..b24907dc 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") -- cgit v1.2.1