diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-11-28 15:56:25 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-11-28 15:56:25 +0000 |
| commit | 134dcdcbd63f8445f6a7cdd59d11f3b0a1ba1a14 (patch) | |
| tree | 57ba735168fa1a8d0152a95aef6b9dd9a75cf31d | |
| parent | 9d7c6149e15b9c708b1409bf0ad77084fcd7df68 (diff) | |
| parent | cfdcde89cfda7f093583de3434f84de3291e6ee9 (diff) | |
| download | morph-134dcdcbd63f8445f6a7cdd59d11f3b0a1ba1a14.tar.gz | |
Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph
| -rw-r--r-- | morphlib/__init__.py | 2 | ||||
| -rw-r--r-- | morphlib/util.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index ef46866a..ad90bd4d 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -38,7 +38,7 @@ __version__ = gitversion.version # List of architectures that Morph supports -valid_archs = ['armv7l', 'armv7b', 'testarch', 'x86_32', 'x86_64'] +valid_archs = ['armv7l', 'armv7b', 'testarch', 'x86_32', 'x86_64', 'ppc64'] class Error(cliapp.AppException): diff --git a/morphlib/util.py b/morphlib/util.py index dd2d05e1..7382e40c 100644 --- a/morphlib/util.py +++ b/morphlib/util.py @@ -402,6 +402,7 @@ def get_host_architecture(): # pragma: no cover 'i686': 'x86_32', 'armv7l': 'armv7l', 'armv7b': 'armv7b', + 'ppc64': 'ppc64' } if machine not in table: |