Merge remote-tracking branch 'origin/master' into rm/systemd

8 files changed, 32 insertions, 25 deletions

diff --git a/base-system.morph b/base-system.morph
deleted file mode 100644
index 5cfe019..0000000
--- a/base-system.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "name": "base",
-    "kind": "system",
-    "disk-size": "10G",
-    "strata": [
-        "foundation",
-        "linux-stratum"
-    ]
-}
diff --git a/devel.morph b/devel.morph
index 1df82e4..a5f587f 100644
--- a/devel.morph
+++ b/devel.morph
@@ -185,14 +185,6 @@
             ]
         },
         {
-            "name": "syslinux",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "nasm",
-                "perl"
-            ]
-        },
-        {
             "name": "python-setuptools",
             "ref": "baserock/morph",
             "build-depends": [
diff --git a/linux-stratum.morph b/imx53-bsp.morph
index 2879736..e5f74eb 100644
--- a/linux-stratum.morph
+++ b/imx53-bsp.morph
@@ -1,5 +1,5 @@
 {
-    "name": "linux-stratum",
+    "name": "imx53-bsp",
     "kind": "stratum",
     "sources": [
         {
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-generic-base-system.morph b/x86_64-generic-base-system.morph
new file mode 100644
index 0000000..8b2d7ad
--- /dev/null
+++ b/x86_64-generic-base-system.morph
@@ -0,0 +1,12 @@
+{
+    "name": "x86_64-generic-base-system",
+    "kind": "system",
+    "disk-size": "10G",
+    "strata": [
+        "x86_64-generic-bsp",
+        "foundation"
+    ],
+    "test-stories": [
+        "stories/login.py"
+    ]
+}
diff --git a/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph
new file mode 100644
index 0000000..1fe46e5
--- /dev/null
+++ b/x86_64-generic-bsp.morph
@@ -0,0 +1,15 @@
+{
+    "name": "x86_64-generic-bsp",
+    "kind": "stratum",
+    "sources": [
+        {
+            "name": "linux",
+            "ref": "baserock/morph"
+        },
+        {
+            "name": "syslinux",
+            "ref": "baserock/morph",
+            "build-depends": []
+        }
+    ]
+}
diff --git a/devel-system.morph b/x86_64-generic-devel-system.morph
index d4ef785..a9fbb82 100644
--- a/devel-system.morph
+++ b/x86_64-generic-devel-system.morph
@@ -1,9 +1,9 @@
 {
-    "name": "devel-system",
+    "name": "x86_64-generic-devel-system",
     "kind": "system",
     "disk-size": "10G",
     "strata": [
-        "linux-stratum",
+        "x86_64-generic-bsp",
         "foundation",
         "devel"
     ]
diff --git a/x86-morph-cache-server-system.morph b/x86_64-generic-morph-cache-server-system.morph
index 695b124..b363bab 100644
--- a/x86-morph-cache-server-system.morph
+++ b/x86_64-generic-morph-cache-server-system.morph
@@ -1,10 +1,10 @@
 {
-    "name": "x86-morph-cache-server-system",
+    "name": "x86_64-generic-morph-cache-server-system",
     "kind": "system",
     "disk-size": "500m",
     "strata": [
+        "x86_64-generic-bsp",
         "foundation",
-        "linux-stratum",
         "morph-cache-server"
     ]
 }