From 537faf84181d1d3186eed976f8a9916401cda0f1 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Wed, 30 Nov 2011 11:02:03 +0000
Subject: 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.
---
 base-system.morph            |  9 +++++++++
 base.morph                   |  9 ---------
 core.morph                   | 23 -----------------------
 devel-bootstrap.morph        | 22 ----------------------
 devel-stratum.morph          | 44 ++++++++++++++++++++++++++++++++++++++++++++
 devel.morph                  | 44 --------------------------------------------
 foundation-stratum.morph     | 23 +++++++++++++++++++++++
 gnome-platform-stratum.morph | 10 ++++++++++
 gnome-platform.morph         | 10 ----------
 9 files changed, 86 insertions(+), 108 deletions(-)
 create mode 100644 base-system.morph
 delete mode 100644 base.morph
 delete mode 100644 core.morph
 delete mode 100644 devel-bootstrap.morph
 create mode 100644 devel-stratum.morph
 delete mode 100644 devel.morph
 create mode 100644 foundation-stratum.morph
 create mode 100644 gnome-platform-stratum.morph
 delete mode 100644 gnome-platform.morph

diff --git a/base-system.morph b/base-system.morph
new file mode 100644
index 00000000..5c8532b9
--- /dev/null
+++ b/base-system.morph
@@ -0,0 +1,9 @@
+{
+    "name": "base",
+    "kind": "system",
+    "disk-size": "1G",
+    "strata": [
+        "core",
+        "linux-stratum"
+    ]
+}
diff --git a/base.morph b/base.morph
deleted file mode 100644
index 5c8532b9..00000000
--- a/base.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "name": "base",
-    "kind": "system",
-    "disk-size": "1G",
-    "strata": [
-        "core",
-        "linux-stratum"
-    ]
-}
diff --git a/core.morph b/core.morph
deleted file mode 100644
index 6035c7a6..00000000
--- a/core.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "core",
-    "kind": "stratum",
-    "sources": [
-        {
-            "name": "fhs-dirs",
-            "ref": "liw/debug"
-        },
-        {
-            "name": "linux-api-headers",
-            "repo": "linux",
-            "ref": "liw/api-headers"
-        },
-        {
-            "name": "eglibc",
-            "ref": "baserock"
-        },
-        {
-            "name": "busybox",
-            "ref": "baserock"
-        }
-    ]
-}
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-stratum.morph b/devel-stratum.morph
new file mode 100644
index 00000000..3941e9ad
--- /dev/null
+++ b/devel-stratum.morph
@@ -0,0 +1,44 @@
+{
+    "name": "devel",
+    "kind": "stratum",
+    "sources": [
+        {
+            "name": "linux",
+            "ref": "baserock/morph",
+            "morph": "linux"
+        },
+        {
+            "name": "fhs-dirs",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "linux-api-headers",
+            "repo": "linux",
+            "ref": "baserock/morph"
+        },
+        {
+            "name": "eglibc",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "zlib",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "binutils",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "autoconf",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "gcc",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "busybox",
+            "ref": "baserock/bootstrap"
+        }
+    ]
+}
diff --git a/devel.morph b/devel.morph
deleted file mode 100644
index 8d29484c..00000000
--- a/devel.morph
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "devel",
-    "kind": "stratum",
-    "sources": [
-        {
-            "name": "linux",
-            "ref": "liw/api-headers",
-            "morph": "linux"
-        },
-        {
-            "name": "fhs-dirs",
-            "ref": "liw/debug"
-        },
-        {
-            "name": "linux-api-headers",
-            "repo": "linux",
-            "ref": "liw/api-headers"
-        },
-        {
-            "name": "eglibc",
-            "ref": "baserock"
-        },
-        {
-            "name": "zlib",
-            "ref": "liw/debug"
-        },
-        {
-            "name": "binutils",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "autoconf",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "gcc",
-            "ref": "liw/debug"
-        },
-        {
-            "name": "busybox",
-            "ref": "baserock"
-        }
-    ]
-}
diff --git a/foundation-stratum.morph b/foundation-stratum.morph
new file mode 100644
index 00000000..35da9284
--- /dev/null
+++ b/foundation-stratum.morph
@@ -0,0 +1,23 @@
+{
+    "name": "foundation",
+    "kind": "stratum",
+    "sources": [
+        {
+            "name": "fhs-dirs",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "linux-api-headers",
+            "repo": "linux",
+            "ref": "baserock/morph"
+        },
+        {
+            "name": "eglibc",
+            "ref": "baserock/bootstrap"
+        },
+        {
+            "name": "busybox",
+            "ref": "baserock/bootstrap"
+        }
+    ]
+}
diff --git a/gnome-platform-stratum.morph b/gnome-platform-stratum.morph
new file mode 100644
index 00000000..592569ac
--- /dev/null
+++ b/gnome-platform-stratum.morph
@@ -0,0 +1,10 @@
+{
+    "name": "gnome-platform",
+    "kind": "stratum",
+    "sources": [
+        {
+            "name": "glib",
+            "ref": "baserock"
+        }
+    ]
+}
diff --git a/gnome-platform.morph b/gnome-platform.morph
deleted file mode 100644
index 592569ac..00000000
--- a/gnome-platform.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "name": "gnome-platform",
-    "kind": "stratum",
-    "sources": [
-        {
-            "name": "glib",
-            "ref": "baserock"
-        }
-    ]
-}
-- 
cgit v1.2.1