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

72 files changed, 798 insertions, 102 deletions

diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32.morph b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
index 3f66d178..9fe7888a 100644
--- a/systems/armv7lhf-cross-toolchain-system-x86_32.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
@@ -16,3 +16,4 @@ configuration-extensions:
 - simple-network
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64.morph b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
index 76197491..c1de199c 100644
--- a/systems/armv7lhf-cross-toolchain-system-x86_64.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
@@ -16,3 +16,4 @@ configuration-extensions:
 - simple-network
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
index 47c69bad..ffc5e188 100644
--- a/systems/base-system-armv7-highbank.morph
+++ b/systems/base-system-armv7-highbank.morph
@@ -17,3 +17,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph
index e5b9d7f5..8de2b35f 100644
--- a/systems/base-system-armv7-versatile.morph
+++ b/systems/base-system-armv7-versatile.morph
@@ -17,3 +17,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph
index 169d490e..23bf4dbf 100644
--- a/systems/base-system-armv7b-highbank.morph
+++ b/systems/base-system-armv7b-highbank.morph
@@ -17,3 +17,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph
index 76d5c006..b06ead7b 100644
--- a/systems/base-system-armv7b-vexpress-tc2.morph
+++ b/systems/base-system-armv7b-vexpress-tc2.morph
@@ -16,3 +16,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph
index b889278d..c827f3a2 100644
--- a/systems/base-system-armv7lhf-highbank.morph
+++ b/systems/base-system-armv7lhf-highbank.morph
@@ -17,3 +17,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-armv8b64.morph b/systems/base-system-armv8b64.morph
new file mode 100644
index 00000000..49e7dac7
--- /dev/null
+++ b/systems/base-system-armv8b64.morph
@@ -0,0 +1,22 @@
+name: base-system-armv8b64
+kind: system
+description: |
+  The set of strata required to have a minimal
+  system for big endian 64-bit ARMv8 computers.
+arch: armv8b64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv8b64-generic
+  morph: strata/bsp-armv8b64-generic.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files
+- moonshot-kernel
+- install-essential-files
diff --git a/systems/base-system-armv8l64.morph b/systems/base-system-armv8l64.morph
new file mode 100644
index 00000000..560add69
--- /dev/null
+++ b/systems/base-system-armv8l64.morph
@@ -0,0 +1,22 @@
+name: base-system-armv8l64
+kind: system
+description: |
+  The set of strata required to have a minimal
+  system for little endian 64-bit ARMv8 computers.
+arch: armv8l64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv8l64-generic
+  morph: strata/bsp-armv8l64-generic.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files
+- moonshot-kernel
+- install-essential-files
diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph
index 488bf5e4..3763cce5 100644
--- a/systems/base-system-ppc64-generic.morph
+++ b/systems/base-system-ppc64-generic.morph
@@ -17,3 +17,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph
index 40e62cad..7ada4052 100644
--- a/systems/base-system-x86_32-generic.morph
+++ b/systems/base-system-x86_32-generic.morph
@@ -11,11 +11,9 @@ strata:
   morph: strata/foundation.morph
 - name: bsp-x86_32-generic
   morph: strata/bsp-x86_32-generic.morph
-- name: cloudinit-support
-  morph: strata/cloudinit-support.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
-- cloud-init
+- install-essential-files
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph
index a3346a44..796c8185 100644
--- a/systems/base-system-x86_64-generic.morph
+++ b/systems/base-system-x86_64-generic.morph
@@ -12,11 +12,9 @@ strata:
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
-- name: cloudinit-support
-  morph: strata/cloudinit-support.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
-- cloud-init
+- install-essential-files
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index b9ee8e79..d43ac935 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/python-cliapp.morph
 - name: python-wsgi
   morph: strata/python-wsgi.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: nfs
@@ -35,6 +37,12 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.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
@@ -44,3 +52,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 6c59cb28..fa948037 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -17,6 +17,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
@@ -35,6 +37,10 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -44,3 +50,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph
new file mode 100644
index 00000000..84495016
--- /dev/null
+++ b/systems/build-system-armv8b64.morph
@@ -0,0 +1,57 @@
+name: build-system-armv8b64
+kind: system
+description:
+- |
+  The system that should be used for building all other Baserock systems
+  for 64-bit ARMv8 computers running in big-endian mode.
+arch: armv8b64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv8b64-generic
+  morph: strata/bsp-armv8b64-generic.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: tools
+  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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: devtools
+  morph: strata/devtools.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
+- moonshot-kernel
+- install-essential-files
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 63dcb432..f79fb76e 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -20,6 +20,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
@@ -38,6 +40,10 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -48,3 +54,4 @@ configuration-extensions:
 - mason
 - cloud-init
 - moonshot-kernel
+- install-essential-files
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 600eb683..38f2e9f3 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -17,6 +17,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
@@ -35,6 +37,10 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -44,3 +50,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 61bf4eaf..f193841f 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -15,6 +15,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
@@ -35,6 +37,10 @@ strata:
   morph: strata/devtools.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -44,3 +50,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index f485287e..a802b64f 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -17,6 +17,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
@@ -37,6 +39,10 @@ strata:
   morph: strata/devtools.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -46,3 +52,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index e8cd7b87..fa54f9d3 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -15,6 +15,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
@@ -35,6 +37,10 @@ strata:
   morph: strata/devtools.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -44,3 +50,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index b9433409..8fe5f91f 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -17,6 +17,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
@@ -37,6 +39,10 @@ strata:
   morph: strata/devtools.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -46,3 +52,4 @@ configuration-extensions:
 - fstab
 - mason
 - cloud-init
+- install-essential-files
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 95b17dc0..7431e56a 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -24,8 +24,14 @@ strata:
   morph: strata/ntpd.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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: openstack-common
@@ -55,3 +61,4 @@ configuration-extensions:
 - install-files
 - ceph
 - cloud-init
+- install-essential-files
diff --git a/systems/cross-bootstrap-system-armv5l-generic.morph b/systems/cross-bootstrap-system-armv5l-generic.morph
new file mode 100644
index 00000000..08cc11f6
--- /dev/null
+++ b/systems/cross-bootstrap-system-armv5l-generic.morph
@@ -0,0 +1,21 @@
+name: cross-bootstrap-system-armv5l-generic
+kind: system
+description: A system that produces the minimum needed to build a devel system
+arch: armv5l
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python-cliapp
+  morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: cross-bootstrap
+  morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
index f0a2780b..e52a0375 100644
--- a/systems/cross-bootstrap-system-armv7lhf-generic.morph
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph
@@ -9,6 +9,12 @@ strata:
   morph: strata/core.morph
 - name: python-cliapp
   morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-armv8b64-generic.morph b/systems/cross-bootstrap-system-armv8b64-generic.morph
new file mode 100644
index 00000000..adfbd412
--- /dev/null
+++ b/systems/cross-bootstrap-system-armv8b64-generic.morph
@@ -0,0 +1,21 @@
+name: cross-bootstrap-system-armv8b64-generic
+kind: system
+description: A system that produces the minimum needed to build a devel system
+arch: armv8b64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python-cliapp
+  morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: cross-bootstrap
+  morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph
index 2bf192d3..5cc2f83b 100644
--- a/systems/cross-bootstrap-system-armv8l64-generic.morph
+++ b/systems/cross-bootstrap-system-armv8l64-generic.morph
@@ -9,6 +9,12 @@ strata:
   morph: strata/core.morph
 - name: python-cliapp
   morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
index 9d736f94..35b3f626 100644
--- a/systems/cross-bootstrap-system-ppc64-generic.morph
+++ b/systems/cross-bootstrap-system-ppc64-generic.morph
@@ -9,6 +9,12 @@ strata:
   morph: strata/core.morph
 - name: python-cliapp
   morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
index ac919d66..471bd40d 100644
--- a/systems/cross-bootstrap-system-x86_64-generic.morph
+++ b/systems/cross-bootstrap-system-x86_64-generic.morph
@@ -9,6 +9,12 @@ strata:
   morph: strata/core.morph
 - name: python-cliapp
   morph: strata/python-cliapp.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: cross-bootstrap
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
index d75fbd14..aaa0fa81 100644
--- a/systems/cxmanage-system-x86_64-generic.morph
+++ b/systems/cxmanage-system-x86_64-generic.morph
@@ -21,3 +21,4 @@ configuration-extensions:
 - nfsboot
 - install-files
 - fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index e32db851..550395d6 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -17,6 +17,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
@@ -43,8 +45,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 9ae051d1..dd9e315a 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-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
@@ -44,8 +46,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
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 12a2b2b6..720561bf 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.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
@@ -44,8 +46,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index ec6fea5e..b7395cee 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.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
@@ -44,8 +46,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 2023ac21..e4457246 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -17,6 +17,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
@@ -35,8 +37,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
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
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 1e2a8f8e..340a27ce 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -17,6 +17,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
@@ -43,8 +45,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 3ef00c34..a4ba2d92 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -19,6 +19,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
@@ -47,8 +49,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
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index dfc28c45..1adde07b 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -17,6 +17,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
@@ -47,8 +49,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 631692e7..05648b97 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -19,6 +19,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
@@ -47,8 +49,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
new file mode 100644
index 00000000..33ceb5a6
--- /dev/null
+++ b/systems/devel-system-armv8b64.morph
@@ -0,0 +1,65 @@
+name: devel-system-armv8b64
+kind: system
+description: |
+  A system with useful tools for doing Baserock development.
+
+  For use on 64-bit ARMv8 computers using big-endian word.
+arch: armv8b64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv8b64-generic
+  morph: strata/bsp-armv8b64-generic.morph
+- name: tools
+  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
+  morph: strata/morph-utils.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: nodejs
+  morph: strata/nodejs.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: lorry
+  morph: strata/lorry.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: python-tools
+  morph: strata/python-tools.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: devtools
+  morph: strata/devtools.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+- moonshot-kernel
+- install-essential-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index bad6d6a9..b5765cac 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.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
@@ -46,6 +48,12 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -54,3 +62,5 @@ configuration-extensions:
 - install-files
 - cloud-init
 - moonshot-kernel
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 1ec03145..a2baa9e0 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -17,6 +17,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
@@ -41,8 +43,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index bfbf3fbb..dd009bc1 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.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
@@ -44,8 +46,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index e83b1a55..f263897e 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -17,6 +17,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
@@ -43,8 +45,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index c707125c..05fa6dcc 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.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
@@ -48,9 +50,17 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
 - cloud-init
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 00e72c84..e2f9e20a 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -17,6 +17,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
@@ -45,8 +47,16 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index e0bb1a21..ac6b52d5 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.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
@@ -48,6 +50,12 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
@@ -55,3 +63,5 @@ configuration-extensions:
 - nfsboot
 - install-files
 - cloud-init
+- fstab
+- install-essential-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index fc40e1f5..a69028c2 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.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
@@ -46,9 +48,17 @@ 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
 configuration-extensions:
 - set-hostname
 - add-config-files
 - nfsboot
 - install-files
 - vagrant
+- fstab
+- install-essential-files
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 512248e2..9306426d 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -44,3 +44,4 @@ configuration-extensions:
 - install-files
 - strip-gplv3
 - fstab
+- install-essential-files
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index ee089536..698230bb 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -42,3 +42,4 @@ configuration-extensions:
 - install-files
 - strip-gplv3
 - fstab
+- install-essential-files
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index d50068e9..7b339c43 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -33,8 +33,8 @@ strata:
   morph: strata/input-common.morph
 - name: llvm-common
   morph: strata/llvm-common.morph
-- name: mesa-common
-  morph: strata/mesa-common.morph
+- name: mesa-common-vm
+  morph: strata/mesa-common-vm.morph
 - name: x-common
   morph: strata/x-common.morph
 - name: weston-genivi
@@ -45,3 +45,4 @@ configuration-extensions:
 - nfsboot
 - install-files
 - strip-gplv3
+- install-essential-files
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
deleted file mode 100644
index 8f89ec74..00000000
--- a/systems/gitlab-ci-runner.morph
+++ /dev/null
@@ -1,58 +0,0 @@
-name: gitlab-ci-runner
-kind: system
-description: A system to run build tests as part of GitLab CI architecture.
-arch: x86_64
-strata:
-- name: build-essential
-  morph: strata/build-essential.morph
-- name: core
-  morph: strata/core.morph
-- name: foundation
-  morph: strata/foundation.morph
-- name: bsp-x86_64-generic
-  morph: strata/bsp-x86_64-generic.morph
-- name: connectivity
-  morph: strata/connectivity.morph
-- name: connman-common
-  morph: strata/connman-common.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
-- name: x-common
-  morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
-- name: multimedia-common
-  morph: strata/multimedia-common.morph
-- name: multimedia-gstreamer
-  morph: strata/multimedia-gstreamer.morph
-- name: genivi
-  morph: strata/genivi.morph
-- name: tools
-  morph: strata/tools.morph
-- name: lvm
-  morph: strata/lvm.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: virtualization
-  morph: strata/virtualization.morph
-- name: openstack-common
-  morph: strata/openstack-common.morph
-- name: openstack-clients
-  morph: strata/openstack-clients.morph
-- name: python-common
-  morph: strata/python-common.morph
-- name: databases
-  morph: strata/databases.morph
-- name: pcre-utils
-  morph: strata/pcre-utils.morph
-- name: webtools
-  morph: strata/webtools.morph
-- name: ruby
-  morph: strata/ruby.morph
-- name: nfs
-  morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph
deleted file mode 100644
index 83093ac1..00000000
--- a/systems/gitlab-server.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: gitlab-server
-kind: system
-description: system which hosts a gitlab server
-arch: x86_64
-strata:
-- name: build-essential
-  morph: strata/build-essential.morph
-- name: bsp-x86_64-generic
-  morph: strata/bsp-x86_64-generic.morph
-- name: foundation
-  morph: strata/foundation.morph
-- name: core
-  morph: strata/core.morph
-- name: tools
-  morph: strata/tools.morph
-- name: nfs
-  morph: strata/nfs.morph
-- name: databases
-  morph: strata/databases.morph
-- name: pcre-utils
-  morph: strata/pcre-utils.morph
-- name: webtools
-  morph: strata/webtools.morph
-- name: ruby
-  morph: strata/ruby.morph
-- name: gitlab
-  morph: strata/gitlab.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- gitlab
-- fstab
diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph
new file mode 100644
index 00000000..726354c9
--- /dev/null
+++ b/systems/installer-system-armv8b64.morph
@@ -0,0 +1,36 @@
+name: installer-system-armv8b64
+kind: system
+description: The system that should be used as an Installer to install other Baserock systems.
+arch: armv8b64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv8b64-generic
+  morph: strata/bsp-armv8b64-generic.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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: installer-utils
+  morph: strata/installer-utils.morph
+configuration-extensions:
+- set-hostname
+- install-files
+- fstab
+- installer
+- moonshot-kernel
+- install-essential-files
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index cea09c09..3d0ced5d 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -15,8 +15,14 @@ strata:
   morph: strata/bsp-x86_64-generic.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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: installer-utils
@@ -26,3 +32,4 @@ configuration-extensions:
 - install-files
 - fstab
 - installer
+- install-essential-files
diff --git a/systems/mason-system-x86_64-generic.morph b/systems/mason-system-x86_64-generic.morph
new file mode 100644
index 00000000..12eae75c
--- /dev/null
+++ b/systems/mason-system-x86_64-generic.morph
@@ -0,0 +1,67 @@
+name: mason-system-x86_64-generic
+kind: system
+description: |
+  A system which contains Zuul and turbo-hipster; to set up a CI pipeline.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: pcre-utils
+  morph: strata/pcre-utils.morph
+- name: lighttpd-server
+  morph: strata/lighttpd-server.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: python-tools
+  morph: strata/python-tools.morph
+- name: python-cliapp
+  morph: strata/python-cliapp.morph
+- name: python-wsgi
+  morph: strata/python-wsgi.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: zuul-ci
+  morph: strata/zuul-ci.morph
+- name: baserock-ci-tests
+  morph: strata/baserock-ci-tests.morph
+
+# TODO: We probably don't need devtools in production Mason systems
+- name: devtools
+  morph: strata/devtools.morph
+
+# TODO: Figure out why these are here. Maybe for graphite?
+- name: webtools
+  morph: strata/webtools.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: nodejs
+  morph: strata/nodejs.morph
+
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/minimal-system-armv5l-openbmc-aspeed.morph b/systems/minimal-system-armv5l-openbmc-aspeed.morph
new file mode 100644
index 00000000..fe596057
--- /dev/null
+++ b/systems/minimal-system-armv5l-openbmc-aspeed.morph
@@ -0,0 +1,20 @@
+name: minimal-system-armv5l-openbmc-aspeed
+kind: system
+description: The set of strata required to have a minimal system for armv5l
+arch: armv5l
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+  artifacts:
+  - build-essential-minimal
+- name: bsp-armv5l-openbmc-aspeed
+  morph: strata/bsp-armv5l-openbmc-aspeed.morph
+  artifacts:
+  - bsp-armv5l-openbmc-aspeed-runtime
+configuration-extensions:
+- set-hostname
+- simple-network
+- nfsboot
+- install-files
+- busybox-init
+- install-essential-files
diff --git a/systems/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic.morph
index 6c48361f..785a72a2 100644
--- a/systems/minimal-system-x86_32-generic.morph
+++ b/systems/minimal-system-x86_32-generic.morph
@@ -18,3 +18,4 @@ configuration-extensions:
 - nfsboot
 - install-files
 - busybox-init
+- install-essential-files
diff --git a/systems/minimal-system-x86_64-generic.morph b/systems/minimal-system-x86_64-generic.morph
index 02fb7deb..9da22ec8 100644
--- a/systems/minimal-system-x86_64-generic.morph
+++ b/systems/minimal-system-x86_64-generic.morph
@@ -18,3 +18,4 @@ configuration-extensions:
 - nfsboot
 - install-files
 - busybox-init
+- install-essential-files
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index 2692e2fc..d5ebcf30 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -19,3 +19,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/ocaml-system-x86_64.morph b/systems/ocaml-system-x86_64.morph
new file mode 100644
index 00000000..1903e4d6
--- /dev/null
+++ b/systems/ocaml-system-x86_64.morph
@@ -0,0 +1,20 @@
+name: ocaml-system-x86_64
+kind: system
+description: OCaml base system
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: ocaml-language
+  morph: strata/ocaml-language.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
new file mode 100644
index 00000000..8ab38bee
--- /dev/null
+++ b/systems/openstack-system-x86_64.morph
@@ -0,0 +1,85 @@
+name: openstack-system-x86_64
+kind: system
+description: Openstack system in baserock for the x86_64 architecture
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: coreutils-common
+  morph: strata/coreutils-common.morph
+- name: devtools
+  morph: strata/devtools.morph
+- name: tools
+  morph: strata/tools.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: lvm
+  morph: strata/lvm.morph
+- name: virtualization
+  morph: strata/virtualization.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: networking-utils
+  morph: strata/networking-utils.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: databases
+  morph: strata/databases.morph
+- name: erlang
+  morph: strata/erlang.morph
+- name: pcre-utils
+  morph: strata/pcre-utils.morph
+- name: apache-httpd-server
+  morph: strata/apache-httpd-server.morph
+- name: django
+  morph: strata/django.morph
+- name: xstatic
+  morph: strata/xstatic.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: openstack-services
+  morph: strata/openstack-services.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: ntpd
+  morph: strata/ntpd.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: test-tools
+  morph: strata/test-tools.morph
+- name: swift
+  morph: strata/swift.morph
+- name: python-tools
+  morph: strata/python-tools.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+- hosts
+- openstack-keystone
+- openstack-glance
+- openstack-cinder
+- openstack-nova
+- openstack-network
+- openstack-neutron
+- openstack-ceilometer
+- fstab
+- openstack-ironic
+- install-essential-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 0a98f205..15b85f70 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -41,3 +41,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 0f768536..3cdce60c 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -43,3 +43,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph
new file mode 100644
index 00000000..81738558
--- /dev/null
+++ b/systems/swift-system-x86_64.morph
@@ -0,0 +1,34 @@
+name: swift-system-x86_64
+kind: system
+description: A base system for deploying swift nodes
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: swift
+  morph: strata/swift.morph
+- name: ntpd
+  morph: strata/ntpd.morph
+- name: python-core
+  morph: strata/python-core.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- fstab
+- swift-storage
+- install-essential-files
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index ab50f7f6..0a5692f5 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -17,8 +17,14 @@ 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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: pcre-utils
@@ -48,3 +54,4 @@ configuration-extensions:
 - fstab
 - install-files
 - cloud-init
+- install-essential-files
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
index 22aa88c0..0b6e84b1 100644
--- a/systems/web-system-x86_64-generic.morph
+++ b/systems/web-system-x86_64-generic.morph
@@ -34,3 +34,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index e1979d44..ccb2c3ee 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -46,3 +46,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index dfa5c3df..6cef12ff 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -31,8 +31,8 @@ strata:
   morph: strata/input-common.morph
 - name: llvm-common
   morph: strata/llvm-common.morph
-- name: mesa-common
-  morph: strata/mesa-common.morph
+- name: mesa-common-vm
+  morph: strata/mesa-common-vm.morph
 - name: weston-common
   morph: strata/weston-common.morph
 - name: x-common
@@ -46,3 +46,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index dad3d3dc..643291d6 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -35,8 +35,14 @@ 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: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 - name: morph-utils
   morph: strata/morph-utils.morph
 - name: xfce
@@ -46,3 +52,4 @@ configuration-extensions:
 - add-config-files
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph
index a2d64a63..a9b01cd5 100644
--- a/systems/zookeeper-client-x86_64.morph
+++ b/systems/zookeeper-client-x86_64.morph
@@ -17,9 +17,12 @@ strata:
   morph: strata/zookeeper.morph
 - name: zookeeper-client
   morph: strata/zookeeper-client.morph
+- name: test-tools
+  morph: strata/test-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
 - simple-network
 - nfsboot
 - install-files
+- install-essential-files
diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph
index be0a8791..987ba9e1 100644
--- a/systems/zookeeper-server-x86_64.morph
+++ b/systems/zookeeper-server-x86_64.morph
@@ -17,9 +17,12 @@ strata:
   morph: strata/zookeeper.morph
 - name: zookeeper-server
   morph: strata/zookeeper-server.morph
+- name: test-tools
+  morph: strata/test-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
 - simple-network
 - nfsboot
 - install-files
+- install-essential-files