diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 11:05:07 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 11:05:07 +0000 |
commit | 13cded5a796889c748e60ffa17fc92bad592bf39 (patch) | |
tree | 6566be1801d1f8d51aded330bcc1b277e764bdcd /morphlib/morphologyfactory.py | |
parent | 8046bf0aa9e3258be6ed79dc529ac6373c37c2d7 (diff) | |
parent | 4b5f45f6c9833f2c81dbbd1eef7a0ff09b73e401 (diff) | |
download | morph-13cded5a796889c748e60ffa17fc92bad592bf39.tar.gz |
Merge branch 'samthursfield/arch'
Reviewed-By: concensus
Diffstat (limited to 'morphlib/morphologyfactory.py')
-rw-r--r-- | morphlib/morphologyfactory.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py index 54ad6364..5b68f1a8 100644 --- a/morphlib/morphologyfactory.py +++ b/morphlib/morphologyfactory.py @@ -106,6 +106,16 @@ class MorphologyFactory(object): '(arch is a mandatory field)' % filename) + valid_archs = ['armv7l', 'armv7b', 'x86_32', 'x86_64'] + + if morphology['arch'] == 'armv7': + morphology._dict['arch'] = 'armv7l' + + if morphology['arch'] not in valid_archs: + raise morphlib.Error('Unknown arch %s. This version of Morph ' + 'supports the following architectures: %s' % + (morphology['arch'], ', '.join(valid_archs))) + if not morphology['system-kind']: raise morphlib.Error('No system-kind defined in system %s ' '(it is a mandatory field)' % filename) |