summaryrefslogtreecommitdiff
path: root/morphlib/morphologyfactory.py
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-26 12:44:48 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-26 12:44:48 +0000
commit1087f571c7cd7c18d2984df3cc90c87410c55bb2 (patch)
treea9a6f13573f6397bd0784323ac27b89408150c9d /morphlib/morphologyfactory.py
parenteb9646f5f1448294a5aea575825318d786ffd14e (diff)
parentb01cff3d2af3b9a3fb410a18bdc2478a33360fac (diff)
downloadmorph-1087f571c7cd7c18d2984df3cc90c87410c55bb2.tar.gz
Merge remote-tracking branch 'origin/richardmaw/S4750-arm-to-armv7'
Reviewed-By: Lars Wirzenius Reviewed-By: Daniel Silverstone
Diffstat (limited to 'morphlib/morphologyfactory.py')
-rw-r--r--morphlib/morphologyfactory.py2
1 files changed, 1 insertions, 1 deletions
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