clean up

All files are now name *-system.morph or *-stratum.morph, to
make it clear what they are. This is redundant, but when we have
both a "linux" chunk and a "linux" stratum, it's good to be clear.

Also, rename core to foundation.

Also, fix references to be the proper branches, for bootstrapping.
Hopefully, the bootstrap branches will work for real building as well,
but if not, we'll deal with that later.

5 files changed, 12 insertions, 34 deletions

diff --git a/base.morph b/base-system.morph
index 5c8532b9..5c8532b9 100644
--- a/base.morph
+++ b/base-system.morph
diff --git a/devel-bootstrap.morph b/devel-bootstrap.morph
deleted file mode 100644
index 655282e1..00000000
--- a/devel-bootstrap.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "devel-bootstrap",
-    "kind": "stratum",
-    "sources": [
-        {
-            "name": "fhs-dirs",
-            "ref": "baserocks/bootstrap"
-        },
-        {
-            "name": "binutils-pass-1",
-            "repo": "binutils",
-            "ref": "baserocks/bootstrap",
-            "morph": "binutils-pass-1"
-        },
-        {
-            "name": "gcc-pass-1",
-            "repo": "gcc",
-            "ref": "baserocks/bootstrap",
-            "morph": "gcc-pass-1"
-        }
-    ]
-}
diff --git a/devel.morph b/devel-stratum.morph
index 8d29484c..3941e9ad 100644
--- a/devel.morph
+++ b/devel-stratum.morph
@@ -4,25 +4,25 @@
     "sources": [
         {
             "name": "linux",
-            "ref": "liw/api-headers",
+            "ref": "baserock/morph",
             "morph": "linux"
         },
         {
             "name": "fhs-dirs",
-            "ref": "liw/debug"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "linux-api-headers",
             "repo": "linux",
-            "ref": "liw/api-headers"
+            "ref": "baserock/morph"
         },
         {
             "name": "eglibc",
-            "ref": "baserock"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "zlib",
-            "ref": "liw/debug"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "binutils",
@@ -34,11 +34,11 @@
         },
         {
             "name": "gcc",
-            "ref": "liw/debug"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "busybox",
-            "ref": "baserock"
+            "ref": "baserock/bootstrap"
         }
     ]
 }
diff --git a/core.morph b/foundation-stratum.morph
index 6035c7a6..35da9284 100644
--- a/core.morph
+++ b/foundation-stratum.morph
@@ -1,23 +1,23 @@
 {
-    "name": "core",
+    "name": "foundation",
     "kind": "stratum",
     "sources": [
         {
             "name": "fhs-dirs",
-            "ref": "liw/debug"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "linux-api-headers",
             "repo": "linux",
-            "ref": "liw/api-headers"
+            "ref": "baserock/morph"
         },
         {
             "name": "eglibc",
-            "ref": "baserock"
+            "ref": "baserock/bootstrap"
         },
         {
             "name": "busybox",
-            "ref": "baserock"
+            "ref": "baserock/bootstrap"
         }
     ]
 }
diff --git a/gnome-platform.morph b/gnome-platform-stratum.morph
index 592569ac..592569ac 100644
--- a/gnome-platform.morph
+++ b/gnome-platform-stratum.morph