From b2efb391b5b60729553684c9783ab4f894400577 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 28 Aug 2012 16:03:44 +0100
Subject: Systems should use full triplets to refer to strata

---
 arm-versatile-base-system.morph                | 12 ++++++++++--
 arm-versatile-devel-system.morph               | 18 +++++++++++++++---
 x86_64-generic-base-system.morph               | 12 ++++++++++--
 x86_64-generic-devel-system.morph              | 18 +++++++++++++++---
 x86_64-generic-morph-cache-server-system.morph | 18 +++++++++++++++---
 5 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/arm-versatile-base-system.morph b/arm-versatile-base-system.morph
index d3a48cb9..82a5fee4 100644
--- a/arm-versatile-base-system.morph
+++ b/arm-versatile-base-system.morph
@@ -6,7 +6,15 @@
     "arch": "arm",
     "disk-size": "2G",
     "strata": [
-        "arm-versatile-bsp",
-        "foundation"
+        {
+            "morph": "arm-versatile-generic-bsp",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        }
     ]
 }
diff --git a/arm-versatile-devel-system.morph b/arm-versatile-devel-system.morph
index 0f30c9db..d7128233 100644
--- a/arm-versatile-devel-system.morph
+++ b/arm-versatile-devel-system.morph
@@ -6,8 +6,20 @@
     "arch": "arm",
     "disk-size": "10G",
     "strata": [
-        "arm-versatile-bsp",
-        "foundation",
-        "devel"
+        {
+            "morph": "arm-versatile-generic-bsp",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "devel",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        }
     ]
 }
diff --git a/x86_64-generic-base-system.morph b/x86_64-generic-base-system.morph
index c6dde16f..35e41bc1 100644
--- a/x86_64-generic-base-system.morph
+++ b/x86_64-generic-base-system.morph
@@ -6,8 +6,16 @@
     "arch": "x86_64",
     "disk-size": "2G",
     "strata": [
-        "x86_64-generic-bsp",
-        "foundation"
+        {
+            "morph": "x86_64-generic-bsp",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        }
     ],
     "test-stories": [
         "stories/login.py"
diff --git a/x86_64-generic-devel-system.morph b/x86_64-generic-devel-system.morph
index f81d3dba..54a771c9 100644
--- a/x86_64-generic-devel-system.morph
+++ b/x86_64-generic-devel-system.morph
@@ -6,8 +6,20 @@
     "arch": "x86_64",
     "disk-size": "10G",
     "strata": [
-        "x86_64-generic-bsp",
-        "foundation",
-        "devel"
+        {
+            "morph": "x86_64-generic-bsp",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "devel",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        }
     ]
 }
diff --git a/x86_64-generic-morph-cache-server-system.morph b/x86_64-generic-morph-cache-server-system.morph
index c15fd510..a170b49c 100644
--- a/x86_64-generic-morph-cache-server-system.morph
+++ b/x86_64-generic-morph-cache-server-system.morph
@@ -6,8 +6,20 @@
     "arch": "x86_64",
     "disk-size": "500m",
     "strata": [
-        "x86_64-generic-bsp",
-        "foundation",
-        "morph-cache-server"
+        {
+            "morph": "x86_64-generic-bsp",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "morph-cache-server",
+            "repo": "baserock:morphs",
+            "ref": "master"
+        }
     ]
 }
-- 
cgit v1.2.1