From a5f21d769559eac4e570e8eecb40fe1d163e82fc Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Fri, 13 Jun 2014 10:02:53 +0000
Subject: Fix release.morph to have unique deployment names

---
 release.morph | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/release.morph b/release.morph
index de9e4e15..e803ee5d 100644
--- a/release.morph
+++ b/release.morph
@@ -5,29 +5,29 @@ description: |
 systems:
 - morph: devel-system-armv7lhf-wandboard
   deploy:
-    release:
+    devel-system-armv7lhf-wandboard:
       type: tar
       location: /src/release/baserock-14.24-devel-system-armv7lhf-wandboard.tar
 - morph: devel-system-x86_32-chroot
   deploy:
-    release:
+    devel-system-x86_32-chroot:
       type: tar
       location: /src/release/baserock-14.24-devel-system-x86_32-chroot.tar
 - morph: devel-system-x86_32-generic
   deploy:
-    release:
+    devel-system-x86_32-generic:
       type: rawdisk
       location: /src/release/baserock-14.24-devel-system-x86_32-generic.img
       DISK_SIZE: 4G
       VERSION_LABEL: baserock-14.24
 - morph: devel-system-x86_64-chroot
   deploy:
-    release:
+    devel-system-x86_64-chroot:
       type: tar
       location: /src/release/baserock-14.24-devel-system-x86_64-chroot.tar
 - morph: devel-system-x86_64-generic
   deploy:
-    release:
+    devel-system-x86_64-generic:
       type: rawdisk
       location: /src/release/baserock-14.24-devel-system-x86_64-generic.img
       DISK_SIZE: 4G
-- 
cgit v1.2.1


From 35004031528b2eb86d53ef30d21dd58faeeaeba3 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Fri, 13 Jun 2014 10:07:08 +0000
Subject: Make the release script check for the system name not "release"

---
 scripts/do-release.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/do-release.py b/scripts/do-release.py
index e11e6625..ce347632 100644
--- a/scripts/do-release.py
+++ b/scripts/do-release.py
@@ -154,14 +154,14 @@ class DeployImages(object):
         for system in release_cluster['systems']:
             system_morph = system['morph']
 
-            if 'release' not in system['deploy']:
+            if system_morph not in system['deploy']:
                 raise cliapp.AppException(
-                    'In release.morph: system %s ID should be "release"' %
-                    system_morph)
+                    'In release.morph: system %s ID should be "%s"' %
+                    (system_morph, system_morph))
 
             # We can't override 'location' with a different value. We must use
             # what's already in the morphology, and check that it makes sense.
-            location = system['deploy']['release']['location']
+            location = system['deploy'][system_morph]['location']
             if not os.path.samefile(os.path.dirname(location),
                                     config.images_dir):
                 raise cliapp.AppException(
-- 
cgit v1.2.1


From d3b4fbec1a3dd26e32da3080bdb544e528d1b78a Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Wed, 18 Jun 2014 16:01:54 +0000
Subject: Update morph to allow partial deployment

---
 tools.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools.morph b/tools.morph
index 831af23d..200688da 100644
--- a/tools.morph
+++ b/tools.morph
@@ -92,7 +92,7 @@ chunks:
   - six
 - name: morph
   repo: baserock:baserock/morph
-  ref: d9be3c69242ff44fd8af05cf4b0bc7f8fe41d691
+  ref: d5ee8bdc636f5830f897b1846522b64bd5f06ebf
   unpetrify-ref: master
   build-depends:
   - cliapp
-- 
cgit v1.2.1