Merge branch 'baserock/jonathanmaw/fixes'

Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Richard Ipsum <richard.ipsum@codethink.co.uk>

5 files changed, 68 insertions, 52 deletions

diff --git a/deploy-genivi-devel-system-armv7.sh b/deploy-genivi-devel-system-armv7.sh
deleted file mode 100755
index 1e3ecce8..00000000
--- a/deploy-genivi-devel-system-armv7.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2012  Codethink Limited
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Creates a GENIVI development system image that is configured for
-# being run inside a qemu-arm emulator.
-
-morph deploy rawdisk devel-system-armv7-versatile \
-             genivi-devel-system-armv7-versatile.img \
-             DISK_SIZE=30G INSTALL_FILES=genivi-devel-system-armv7/manifest
diff --git a/release-deploy-rawdisk b/release-deploy-rawdisk
deleted file mode 100755
index cee1c8e2..00000000
--- a/release-deploy-rawdisk
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Deploy systems to rawdisk images for release
-#
-# Copyright (C) 2013  Codethink Limited
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-set -eu
-
-for system in "$@"
-do
-    morph --no-git-update deploy rawdisk "$system" "${system}.img" \
-        DISK_SIZE=4G
-done
diff --git a/release.morph b/release.morph
new file mode 100644
index 00000000..e94cbeb6
--- /dev/null
+++ b/release.morph
@@ -0,0 +1,65 @@
+name: release
+kind: cluster
+description: |
+  Deploy all the systems for we support in a release.
+systems:
+- morph: base-system-armv7-versatile
+  deploy:
+    release:
+      type: tar
+      location: /src/release/baserock-11-base-system-armv7-versatile.tar
+- morph: devel-system-armv7-versatile
+  deploy:
+    as-tar:
+      type: tar
+      location: /src/release/baserock-11-devel-system-armv7-versatile.tar
+      INSTALL_FILES: genivi-devel-system-armv7/manifest
+    as-disk:
+      type: rawdisk
+      location: /src/release/baserock-11-devel-system-armv7-versatile.img
+      DISK_SIZE: 30G
+      INSTALL_FILES: genivi-devel-system-armv7/manifest
+- morph: devel-system-armv7-wandboard
+  deploy:
+    release:
+      type: tar
+      location: /src/release/baserock-11-devel-system-armv7-wandboard.tar
+- morph: genivi-baseline-system-armv7-versatile
+  deploy:
+    as-tar:
+      type: tar
+      location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.tar
+    as-disk:
+      type: rawdisk
+      location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.img
+      DISK_SIZE: 4G
+- morph: base-system-x86_32-generic
+  deploy:
+    release:
+      type: rawdisk
+      location: /src/release/baserock-11-base-system-x86_32-generic.img
+      DISK_SIZE: 4G
+- morph: devel-system-x86_32-generic
+  deploy:
+    release:
+      type: rawdisk
+      location: /src/release/baserock-11-devel-system-x86_32-generic.img
+      DISK_SIZE: 4G
+- morph: base-system-x86_64-generic
+  deploy:
+    release:
+      type: rawdisk
+      location: /src/release/baserock-11-base-system-x86_64-generic.img
+      DISK_SIZE: 4G
+- morph: devel-system-x86_64-generic
+  deploy:
+    release:
+      type: rawdisk
+      location: /src/release/baserock-11-devel-system-x86_64-generic.img
+      DISK_SIZE: 4G
+- morph: genivi-baseline-system-x86_64-generic
+  deploy:
+    release:
+      type: rawdisk
+      location: /src/release/baserock-11-genivi-baseline-system-x86_64-generic.img
+      DISK_SIZE: 4G
diff --git a/xfce-system.morph b/xfce-system.morph
index 63f7452e..63d34c95 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -48,11 +48,11 @@ strata:
   ref: master
   repo: baserock:baserock/morphs
 - morph: gtk2
-  ref: baserock/xfce-build-rebase-2
+  ref: master
   repo: baserock:baserock/morphs
 - morph: tools
   ref: master
   repo: baserock:baserock/morphs
 - morph: xfce
-  ref: baserock/xfce-build-rebase-2
+  ref: master
   repo: baserock:baserock/morphs
diff --git a/xfce.morph b/xfce.morph
index e720cc01..7c145e9f 100644
--- a/xfce.morph
+++ b/xfce.morph
@@ -3,7 +3,7 @@ build-depends:
   ref: master
   repo: baserock:baserock/morphs
 - morph: gtk2
-  ref: baserock/xfce-build-rebase-2
+  ref: master
   repo: baserock:baserock/morphs
 - morph: x-x86_64-generic
   ref: master