From 1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 2 Oct 2014 14:16:00 +0000
Subject: Split morph out of tools

morph now contains distbuild and morph-cache-server, so the distbuild
stratum can go away, and anything that needs it can now use morph.
---
 systems/devel-system-armv7-chroot.morph          | 2 ++
 systems/devel-system-armv7-highbank.morph        | 2 ++
 systems/devel-system-armv7-versatile.morph       | 2 ++
 systems/devel-system-armv7-wandboard.morph       | 2 ++
 systems/devel-system-armv7b-chroot.morph         | 2 ++
 systems/devel-system-armv7b-highbank.morph       | 2 ++
 systems/devel-system-armv7lhf-chroot.morph       | 2 ++
 systems/devel-system-armv7lhf-highbank.morph     | 2 ++
 systems/devel-system-armv7lhf-jetson.morph       | 2 ++
 systems/devel-system-armv7lhf-wandboard.morph    | 2 ++
 systems/devel-system-ppc64-chroot.morph          | 2 ++
 systems/devel-system-ppc64-generic.morph         | 2 ++
 systems/devel-system-x86_32-chroot.morph         | 2 ++
 systems/devel-system-x86_32-generic.morph        | 2 ++
 systems/devel-system-x86_64-chroot.morph         | 2 ++
 systems/devel-system-x86_64-generic.morph        | 2 ++
 systems/devel-system-x86_64-vagrant.morph        | 2 ++
 systems/distbuild-system-armv7lhf-highbank.morph | 4 ++--
 systems/distbuild-system-armv7lhf-jetson.morph   | 4 ++--
 systems/distbuild-system-ppc64.morph             | 4 ++--
 systems/distbuild-system-x86_32.morph            | 4 ++--
 systems/distbuild-system-x86_64.morph            | 4 ++--
 systems/trove-system-x86_64.morph                | 2 ++
 systems/xfce-system.morph                        | 2 ++
 24 files changed, 48 insertions(+), 10 deletions(-)

(limited to 'systems')

diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index fd1cf5fd..b063673c 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 112a8af2..3e86b737 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-armv7-highbank.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index efa48ece..43f7a118 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-armv7-versatile.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 49d189d0..11bccaf0 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -13,6 +13,8 @@ strata:
   morph: strata/bsp-wandboard.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 4ee06869..5081bd20 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -11,6 +11,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 686b97f5..9054135b 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-armv7b-highbank.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 4505331c..090d4e6d 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -11,6 +11,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index ed2d41d8..bb5c01b4 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-armv7-highbank.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 74a1cc25..ffcf1766 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 - name: bsp-jetson-devel
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 00ef2004..8f15033a 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -13,6 +13,8 @@ strata:
   morph: strata/bsp-wandboard.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index a2430afb..344aa812 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 259e224e..7ccff388 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-ppc64-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 configuration-extensions:
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index a7085737..dc884223 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 - name: bsp-x86_both-tools
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index a7f3f9ce..d9264ac4 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-x86_32-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 - name: cloudinit-support
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 91f80dbc..34ccf31f 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 - name: bsp-x86_both-tools
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index bf5a7f45..64133058 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -14,6 +14,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
 - name: cloudinit-support
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 29acb5bc..43f68e7f 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -33,6 +33,8 @@ strata:
   morph: strata/genivi-x-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: virtualization
   morph: strata/virtualization.morph
 - name: openstack-clients
diff --git a/systems/distbuild-system-armv7lhf-highbank.morph b/systems/distbuild-system-armv7lhf-highbank.morph
index 112883b9..7d0caf82 100644
--- a/systems/distbuild-system-armv7lhf-highbank.morph
+++ b/systems/distbuild-system-armv7lhf-highbank.morph
@@ -13,10 +13,10 @@ strata:
   morph: strata/bsp-armv7-highbank.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: distbuild
-  morph: strata/distbuild.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/distbuild-system-armv7lhf-jetson.morph b/systems/distbuild-system-armv7lhf-jetson.morph
index 8423264e..8c9348b4 100644
--- a/systems/distbuild-system-armv7lhf-jetson.morph
+++ b/systems/distbuild-system-armv7lhf-jetson.morph
@@ -13,10 +13,10 @@ strata:
   morph: strata/bsp-jetson-devel.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: distbuild
-  morph: strata/distbuild.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/distbuild-system-ppc64.morph b/systems/distbuild-system-ppc64.morph
index e8c57048..f7fae96f 100644
--- a/systems/distbuild-system-ppc64.morph
+++ b/systems/distbuild-system-ppc64.morph
@@ -13,10 +13,10 @@ strata:
   morph: strata/bsp-ppc64-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: distbuild
-  morph: strata/distbuild.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/distbuild-system-x86_32.morph b/systems/distbuild-system-x86_32.morph
index f2078678..25c01ab2 100644
--- a/systems/distbuild-system-x86_32.morph
+++ b/systems/distbuild-system-x86_32.morph
@@ -13,10 +13,10 @@ strata:
   morph: strata/bsp-x86_32-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: distbuild
-  morph: strata/distbuild.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/distbuild-system-x86_64.morph b/systems/distbuild-system-x86_64.morph
index b248d9db..c42cb553 100644
--- a/systems/distbuild-system-x86_64.morph
+++ b/systems/distbuild-system-x86_64.morph
@@ -13,10 +13,10 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: distbuild
-  morph: strata/distbuild.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index fbcdf3fe..297c9fb2 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -13,6 +13,8 @@ strata:
   morph: strata/core.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: trove
   morph: strata/trove.morph
 - name: nfs
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 17531e89..0c53d7c2 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -33,6 +33,8 @@ strata:
   morph: strata/gtk2.morph
 - name: tools
   morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: xfce
   morph: strata/xfce.morph
 configuration-extensions:
-- 
cgit v1.2.1