diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-01 12:58:17 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-01 12:58:17 +0100 |
| commit | 244f2455f296ed874cbd772a07b6161e7e54b478 (patch) | |
| tree | 317e96a45afd6bf8b8f75d56a0ab923b1712af2c | |
| parent | e9676beb39f7d6d070841e878543c740fa37abce (diff) | |
| download | morphs-244f2455f296ed874cbd772a07b6161e7e54b478.tar.gz | |
Squashme: Further work related to the x86_64-generic-bsp stratum.
| -rw-r--r-- | morph-cache-server.morph | 3 | ||||
| -rw-r--r-- | x86_64-generic-base-system.morph (renamed from x86_64-base-system.morph) | 4 | ||||
| -rw-r--r-- | x86_64-generic-bsp.morph | 14 | ||||
| -rw-r--r-- | x86_64-generic-devel-system.morph (renamed from x86_64-devel-system.morph) | 4 | ||||
| -rw-r--r-- | x86_64-generic-morph-cache-server-system.morph (renamed from x86_64-morph-cache-server-system.morph) | 4 |
5 files changed, 20 insertions, 9 deletions
diff --git a/morph-cache-server.morph b/morph-cache-server.morph index f868bf1..72c6ada 100644 --- a/morph-cache-server.morph +++ b/morph-cache-server.morph @@ -1,9 +1,6 @@ { "name": "morph-cache-server", "kind": "stratum", - "build-depends": [ - "foundation" - ], "sources": [ { "name": "git", diff --git a/x86_64-base-system.morph b/x86_64-generic-base-system.morph index cff0166..8b2d7ad 100644 --- a/x86_64-base-system.morph +++ b/x86_64-generic-base-system.morph @@ -1,9 +1,9 @@ { - "name": "x86_64-base-system", + "name": "x86_64-generic-base-system", "kind": "system", "disk-size": "10G", "strata": [ - "x86_64-bsp", + "x86_64-generic-bsp", "foundation" ], "test-stories": [ diff --git a/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph new file mode 100644 index 0000000..095002e --- /dev/null +++ b/x86_64-generic-bsp.morph @@ -0,0 +1,14 @@ +{ + "name": "x86_64-generic-bsp", + "kind": "stratum", + "sources": [ + { + "name": "linux", + "ref": "baserock/morph" + }, + { + "name": "syslinux", + "ref": "bnaserock/morph" + } + ] +} diff --git a/x86_64-devel-system.morph b/x86_64-generic-devel-system.morph index 6a89b83..a9fbb82 100644 --- a/x86_64-devel-system.morph +++ b/x86_64-generic-devel-system.morph @@ -1,9 +1,9 @@ { - "name": "x86_64-devel-system", + "name": "x86_64-generic-devel-system", "kind": "system", "disk-size": "10G", "strata": [ - "x86_64-bsp", + "x86_64-generic-bsp", "foundation", "devel" ] diff --git a/x86_64-morph-cache-server-system.morph b/x86_64-generic-morph-cache-server-system.morph index 27ce111..b363bab 100644 --- a/x86_64-morph-cache-server-system.morph +++ b/x86_64-generic-morph-cache-server-system.morph @@ -1,9 +1,9 @@ { - "name": "x86_64-morph-cache-server-system", + "name": "x86_64-generic-morph-cache-server-system", "kind": "system", "disk-size": "500m", "strata": [ - "x86_64-bsp", + "x86_64-generic-bsp", "foundation", "morph-cache-server" ] |