diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
commit | 3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7 (patch) | |
tree | 4875e396af3ef083ee6883775e34c48e52605e2d /systems/devel-system-armv7b-highbank.morph | |
parent | c368f61b0b460f120634219a5b70186c803d5bed (diff) | |
parent | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (diff) | |
download | infrastructure-3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7.tar.gz |
Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2
Conflicts:
baserock_irclogs/systems/irclogs-x86_64.morph
hosts
scripts/licensecheck.pl
Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f
Diffstat (limited to 'systems/devel-system-armv7b-highbank.morph')
-rw-r--r-- | systems/devel-system-armv7b-highbank.morph | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 2c7f8ed2..990aec67 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -40,8 +42,18 @@ strata: morph: strata/devtools.morph - name: ansible morph: strata/ansible.morph +- name: swift + morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph +- name: unionfs-fuse-group + morph: strata/unionfs-fuse-group.morph configuration-extensions: - set-hostname - add-config-files - nfsboot - install-files +- fstab +- install-essential-files |