diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-10-01 11:47:45 +0000 |
---|---|---|
committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-10-01 11:47:45 +0000 |
commit | 4251aff823a82cc412a3f8ea8c089f2dbd9ac8f5 (patch) | |
tree | aa60fe753a9b94b4abb719c5bb085d44d2b8d608 | |
parent | 51b664a912139ea73c0cd23099f4db2f44c00339 (diff) | |
parent | da66b3366346a6bfa57cdb67c1fd265b6f1e6790 (diff) | |
download | morphs-4251aff823a82cc412a3f8ea8c089f2dbd9ac8f5.tar.gz |
Merge branch 'baserock/jonathanmaw/fixes'
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Richard Ipsum <richard.ipsum@codethink.co.uk>
-rwxr-xr-x | deploy-genivi-devel-system-armv7.sh | 22 | ||||
-rwxr-xr-x | release-deploy-rawdisk | 27 | ||||
-rw-r--r-- | release.morph | 65 | ||||
-rw-r--r-- | xfce-system.morph | 4 | ||||
-rw-r--r-- | xfce.morph | 2 |
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 1e3ecce..0000000 --- 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 cee1c8e..0000000 --- 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 0000000..e94cbeb --- /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 63f7452..63d34c9 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 @@ -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 |