From 583f8d72022d2d424b39c831983b27bd92be947f Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Wed, 1 Jun 2016 22:00:01 +0000
Subject: Fix names to match paths

Change-Id: Ie55e6baece022df18700968827f91b84f377218d
---
 clusters/cephclient.morph                      | 2 +-
 clusters/mason-openstack.morph                 | 2 +-
 clusters/moonshot-m2-armv8b64.morph            | 2 +-
 clusters/moonshot-pxe-armv8b64.morph           | 2 +-
 clusters/moonshot-pxe-armv8l64.morph           | 2 +-
 clusters/sdk-example-cluster.morph             | 2 +-
 clusters/weston-qt5-system-x86_64-deploy.morph | 2 +-
 strata/bsp-x86_32-ivi.morph                    | 2 +-
 strata/bsp-x86_64-ivi.morph                    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph
index 9eaf92ee..abf15413 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph
@@ -1,4 +1,4 @@
-name: ceph-cluster
+name: cephclient
 kind: cluster
 systems:
 - morph: systems/ceph-service-x86_64-generic.morph
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index cc7c1d4d..6a854bd5 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -1,4 +1,4 @@
-name: openstack-mason
+name: mason-openstack
 kind: cluster
 description: |
   This is a template cluster morphology that can be adapted to set up a
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index caa460c3..a1057fbd 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -1,4 +1,4 @@
-name: moonshot-m2-deployment
+name: moonshot-m2-armv8b64
 kind: cluster
 description: |
   Install a build armv8b64 system into the M.2 SSD storage of an HP
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index af59817a..b1734084 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -1,4 +1,4 @@
-name: moonshot-m400-armv8b64-netboot
+name: moonshot-pxe-armv8b64
 kind: cluster
 description: |
   Deploy a big-endian armv8b64 devel system onto an HP Moonshot node
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 80771d52..1bce7791 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -1,4 +1,4 @@
-name: moonshot-m400-armv8l64-netboot
+name: moonshot-pxe-armv8l64
 kind: cluster
 description: |
   Deploy an armv8l64 devel system into a HP Moonshot node
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph
index a4413c3b..961afdcb 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.morph
@@ -1,4 +1,4 @@
-name: sdk
+name: sdk-example-cluster
 kind: cluster
 description: |
   An example of creating a cross-compile SDK for an embedded Baserock system.
diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-x86_64-deploy.morph
index 64700314..fa876dce 100644
--- a/clusters/weston-qt5-system-x86_64-deploy.morph
+++ b/clusters/weston-qt5-system-x86_64-deploy.morph
@@ -1,4 +1,4 @@
-name: weston-qt5-system-x86_64
+name: weston-qt5-system-x86_64-deploy
 kind: cluster
 description: |
   Deploy a stock weston system.
diff --git a/strata/bsp-x86_32-ivi.morph b/strata/bsp-x86_32-ivi.morph
index 04e34b52..180f02eb 100644
--- a/strata/bsp-x86_32-ivi.morph
+++ b/strata/bsp-x86_32-ivi.morph
@@ -5,7 +5,7 @@ description: Set of components required for booting a 32-bit
 build-depends:
 - morph: strata/bsp-x86_both-tools.morph
 chunks:
-- name: linux-x86-32-generic
+- name: linux-x86-32-ivi
   morph: strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
   repo: upstream:linux-stable
   ref: 2dcd0af568b0cf583645c8a317dd12e344b1c72a
diff --git a/strata/bsp-x86_64-ivi.morph b/strata/bsp-x86_64-ivi.morph
index e150908b..1d01ac2e 100644
--- a/strata/bsp-x86_64-ivi.morph
+++ b/strata/bsp-x86_64-ivi.morph
@@ -5,7 +5,7 @@ description: Set of components required for booting a 64-bit
 build-depends:
 - morph: strata/bsp-x86_both-tools.morph
 chunks:
-- name: linux-x86-64-generic
+- name: linux-x86-64-ivi
   morph: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
   repo: upstream:linux-stable
   ref: 2dcd0af568b0cf583645c8a317dd12e344b1c72a
-- 
cgit v1.2.1