diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-27 17:03:48 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-27 17:03:48 +0100 |
commit | 461aaeb9d5764539d1276c3642138c914940b796 (patch) | |
tree | 30c2976d000705d7449430f13c5c81a318cc3355 | |
parent | 23ea96e88e236a29485dce5d475d5dfe61e3d1e2 (diff) | |
parent | 12b16edc969733d2f161bb726b671bbcedfdd377 (diff) | |
download | morphs-461aaeb9d5764539d1276c3642138c914940b796.tar.gz |
Merge branch 'liw/fix'
This includes fixes for system morphologies to add the newly mandatory
field system-kind.
-rw-r--r-- | arm-versatile-base-system.morph | 1 | ||||
-rw-r--r-- | arm-versatile-devel-system.morph | 1 | ||||
-rw-r--r-- | x86_64-generic-base-system.morph | 1 | ||||
-rw-r--r-- | x86_64-generic-devel-system.morph | 1 | ||||
-rw-r--r-- | x86_64-generic-morph-cache-server-system.morph | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arm-versatile-base-system.morph b/arm-versatile-base-system.morph index 526a296..d3a48cb 100644 --- a/arm-versatile-base-system.morph +++ b/arm-versatile-base-system.morph @@ -2,6 +2,7 @@ "name": "arm-versatile-base-system", "description": "The set of strata required to have a minimal system for an ARM versatile system.", "kind": "system", + "system-kind": "rootfs-tarball", "arch": "arm", "disk-size": "2G", "strata": [ diff --git a/arm-versatile-devel-system.morph b/arm-versatile-devel-system.morph index 43297eb..0f30c9d 100644 --- a/arm-versatile-devel-system.morph +++ b/arm-versatile-devel-system.morph @@ -2,6 +2,7 @@ "name": "arm-versatile-devel-system", "description": "A system that is able to build other systems based on the ARM versatile architecture.", "kind": "system", + "system-kind": "rootfs-tarball", "arch": "arm", "disk-size": "10G", "strata": [ diff --git a/x86_64-generic-base-system.morph b/x86_64-generic-base-system.morph index f293f3e..aa22d8a 100644 --- a/x86_64-generic-base-system.morph +++ b/x86_64-generic-base-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-base-system", "description": "The set of strata required to have a minimal system for a 64-bit x86 system.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "2G", "disk-size": "10G", diff --git a/x86_64-generic-devel-system.morph b/x86_64-generic-devel-system.morph index 0fc8060..f81d3db 100644 --- a/x86_64-generic-devel-system.morph +++ b/x86_64-generic-devel-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-devel-system", "description": "A system that is able to build other systems based on the 64-bit x86 architecture.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "10G", "strata": [ diff --git a/x86_64-generic-morph-cache-server-system.morph b/x86_64-generic-morph-cache-server-system.morph index c7a55ef..c15fd51 100644 --- a/x86_64-generic-morph-cache-server-system.morph +++ b/x86_64-generic-morph-cache-server-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-morph-cache-server-system", "description": "A system that will be able to provide a remote repository or artifact cache for morph, designed to run on the 64-bit x86 architecture.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "500m", "strata": [ |