diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-01 12:55:17 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-01 12:55:17 +0100 |
| commit | e9676beb39f7d6d070841e878543c740fa37abce (patch) | |
| tree | 4896b330b0ce768d394bf08d1bc8d1996ff5d003 | |
| parent | 3b80a83f3cd09874c2c61dc709ed4067b10b3f9f (diff) | |
| download | morphs-e9676beb39f7d6d070841e878543c740fa37abce.tar.gz | |
Squashme: Initial work on creating an x86_64 BSP stratum.
| -rw-r--r-- | devel.morph | 4 | ||||
| -rw-r--r-- | linux-stratum.morph | 10 | ||||
| -rw-r--r-- | x86_64-base-system.morph (renamed from base-system.morph) | 6 | ||||
| -rw-r--r-- | x86_64-devel-system.morph (renamed from devel-system.morph) | 4 | ||||
| -rw-r--r-- | x86_64-morph-cache-server-system.morph (renamed from x86-morph-cache-server-system.morph) | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/devel.morph b/devel.morph index 551fa23..edaa2d3 100644 --- a/devel.morph +++ b/devel.morph @@ -249,10 +249,6 @@ "build-depends": [] }, { - "name": "syslinux", - "ref": "baserock/morph" - }, - { "name": "python-setuptools", "ref": "baserock/morph", "build-depends": [ diff --git a/linux-stratum.morph b/linux-stratum.morph deleted file mode 100644 index 2879736..0000000 --- a/linux-stratum.morph +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "linux-stratum", - "kind": "stratum", - "sources": [ - { - "name": "linux", - "ref": "baserock/morph" - } - ] -} diff --git a/base-system.morph b/x86_64-base-system.morph index 6a8c971..cff0166 100644 --- a/base-system.morph +++ b/x86_64-base-system.morph @@ -1,10 +1,10 @@ { - "name": "base", + "name": "x86_64-base-system", "kind": "system", "disk-size": "10G", "strata": [ - "foundation", - "linux-stratum" + "x86_64-bsp", + "foundation" ], "test-stories": [ "stories/login.py" diff --git a/devel-system.morph b/x86_64-devel-system.morph index d4ef785..6a89b83 100644 --- a/devel-system.morph +++ b/x86_64-devel-system.morph @@ -1,9 +1,9 @@ { - "name": "devel-system", + "name": "x86_64-devel-system", "kind": "system", "disk-size": "10G", "strata": [ - "linux-stratum", + "x86_64-bsp", "foundation", "devel" ] diff --git a/x86-morph-cache-server-system.morph b/x86_64-morph-cache-server-system.morph index 695b124..27ce111 100644 --- a/x86-morph-cache-server-system.morph +++ b/x86_64-morph-cache-server-system.morph @@ -1,10 +1,10 @@ { - "name": "x86-morph-cache-server-system", + "name": "x86_64-morph-cache-server-system", "kind": "system", "disk-size": "500m", "strata": [ + "x86_64-bsp", "foundation", - "linux-stratum", "morph-cache-server" ] } |