diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-04-15 15:55:30 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-04-15 15:55:30 +0000 |
commit | 358ee3d53539582d040b6f259aae47dcf4bbe14a (patch) | |
tree | 9472e7b375caa3593775f185bc9a6e99854b086f | |
parent | aa85df216ef454a47f2d6d027fcec2400d1083e3 (diff) | |
download | definitions-baserock/adamcoldrick/chunks-in-definitions-by-kind-rebase.tar.gz |
Make the morph fields in cluster morphs point to the right placebaserock/adamcoldrick/chunks-in-definitions-by-kind-rebase
-rw-r--r-- | clusters/image-package-example.morph | 2 | ||||
-rw-r--r-- | clusters/minimal-system-deploy.morph | 2 | ||||
-rw-r--r-- | clusters/release.morph | 20 | ||||
-rw-r--r-- | clusters/sdk-example-cluster.morph | 4 | ||||
-rw-r--r-- | clusters/upgrade-devel.morph | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph index 616df62f..fd8487e2 100644 --- a/clusters/image-package-example.morph +++ b/clusters/image-package-example.morph @@ -3,7 +3,7 @@ kind: cluster description: | Packaged system and script for installing it, for deferred instantiation. systems: -- morph: base-system-x86_32-generic.morph +- morph: systems/base-system-x86_32-generic.morph deploy: imgpkg: type: image-package diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph index fc2157bb..06629ffc 100644 --- a/clusters/minimal-system-deploy.morph +++ b/clusters/minimal-system-deploy.morph @@ -3,7 +3,7 @@ kind: cluster description: | Deploy a minimal system to a system running KVM systems: -- morph: minimal-system-x86_32-generic.morph +- morph: systems/minimal-system-x86_32-generic.morph deploy: vm: type: kvm diff --git a/clusters/release.morph b/clusters/release.morph index 66b6ba37..bd60cde6 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -3,56 +3,56 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: -- morph: base-system-armv7-highbank.morph +- morph: systems/base-system-armv7-highbank.morph deploy: as-tar: type: tar location: /src/release/baserock-13-base-system-armv7-highbank.tar -- morph: devel-system-armv7-highbank.morph +- morph: systems/devel-system-armv7-highbank.morph deploy: as-tar: type: tar location: /src/release/baserock-13-devel-system-armv7-highbank.tar -- morph: base-system-armv7b-highbank.morph +- morph: systems/base-system-armv7b-highbank.morph deploy: as-tar: type: tar location: /src/release/baserock-13-base-system-armv7b-highbank.tar -- morph: devel-system-armv7b-highbank.morph +- morph: systems/devel-system-armv7b-highbank.morph deploy: as-tar: type: tar location: /src/release/baserock-13-devel-system-armv7b-highbank.tar -- morph: devel-system-armv7-wandboard.morph +- morph: systems/devel-system-armv7-wandboard.morph deploy: release: type: tar location: /src/release/baserock-13-devel-system-armv7-wandboard.tar -- morph: base-system-x86_32-generic.morph +- morph: systems/base-system-x86_32-generic.morph deploy: release: type: rawdisk location: /src/release/baserock-13-base-system-x86_32-generic.img DISK_SIZE: 4G -- morph: devel-system-x86_32-generic.morph +- morph: systems/devel-system-x86_32-generic.morph deploy: release: type: rawdisk location: /src/release/baserock-13-devel-system-x86_32-generic.img DISK_SIZE: 4G -- morph: base-system-x86_64-generic.morph +- morph: systems/base-system-x86_64-generic.morph deploy: release: type: rawdisk location: /src/release/baserock-13-base-system-x86_64-generic.img DISK_SIZE: 4G -- morph: devel-system-x86_64-generic.morph +- morph: systems/devel-system-x86_64-generic.morph deploy: release: type: rawdisk location: /src/release/baserock-13-devel-system-x86_64-generic.img DISK_SIZE: 4G -- morph: genivi-baseline-system-x86_64-generic.morph +- morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: release: type: rawdisk diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph index 2824b00a..f71d093d 100644 --- a/clusters/sdk-example-cluster.morph +++ b/clusters/sdk-example-cluster.morph @@ -31,7 +31,7 @@ description: | See the documentation of the sdk.write extension for more information. systems: -- morph: armv7lhf-cross-toolchain-system-x86_32-generic.morph +- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph deploy: sdk: type: sdk @@ -39,7 +39,7 @@ systems: PREFIX: /usr TARGET: armv7lhf-baserock-linux-gnueabi subsystems: - - morph: devel-system-armv7lhf-highbank + - morph: systems/devel-system-armv7lhf-highbank.morph deploy: sysroot: type: sysroot diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph index b86dfb7f..2d8d548e 100644 --- a/clusters/upgrade-devel.morph +++ b/clusters/upgrade-devel.morph @@ -36,7 +36,7 @@ description: | On a base system, use 'diff -r' instead of 'git diff --no-index'. It will not be as colourful. systems: -- morph: devel-system-x86_64-generic.morph +- morph: systems/devel-system-x86_64-generic.morph deploy: upgrade-devel: type: ssh-rsync |