Merge branch 'baserock/samthursfield/build-essential-2-rebase'

Baserock no longer requires a staging filler to build. Instead, the
tools of the host system are used to bootstrap a compiler which then
builds the rest of the system in a staging chroot, as was previously
done with the staging filler.

There are likely to be errors if you do try to build with a staging
filler, because it will interfere with the build-essential bootstrap
process.

Versions of Morph before the following commit can no longer build
Baserock systems:

    commit 13cded5a796889c748e60ffa17fc92bad592bf39
    Merge: 8046bf0 4b5f45f
    Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
    Date:   Fri Mar 15 11:05:07 2013 +0000

        Merge branch 'samthursfield/arch'

        Reviewed-By: concensus

1 files changed, 283 insertions, 23 deletions

diff --git a/build-essential.morph b/build-essential.morph
index 5a3fb2c0..c8c9413a 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -4,58 +4,318 @@
     "kind": "stratum",
     "chunks": [
         {
-            "name": "binutils",
+            "name": "stage1-binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/build-essential",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
             "build-depends": []
         },
         {
-            "name": "busybox",
-            "repo": "upstream:busybox",
-            "ref": "baserock/build-essential",
-            "build-depends": []
+            "name": "stage1-gcc",
+            "repo": "upstream:gcc-tarball",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils"
+            ]
         },
         {
-            "name": "eglibc",
+            "name": "stage2-linux-api-headers",
+            "repo": "upstream:linux",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc"
+            ]
+        },
+        {
+            "name": "stage2-eglibc",
             "repo": "upstream:eglibc2",
-            "ref": "baserock/2.15-build-essential",
-            "build-depends": []
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-linux-api-headers"
+            ]
         },
         {
-            "name": "fhs-dirs",
-            "repo": "baserock:baserock/fhs-dirs",
-            "ref": "master",
-            "build-depends": []
+            "name": "stage2-zlib",
+            "repo": "upstream:zlib",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc"
+            ]
         },
         {
-            "name": "gcc",
+            "name": "stage2-binutils",
+            "repo": "upstream:binutils-redhat",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc",
+                "stage2-zlib"
+            ]
+        },
+        {
+            "name": "stage2-gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/build-essential",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc",
+                "stage2-zlib"
+            ]
+        },
+        {
+            "name": "stage2-busybox",
+            "repo": "upstream:busybox",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc"
+            ]
+        },
+        {
+            "name": "stage2-fhs-dirs",
+            "repo": "baserock:baserock/fhs-dirs",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
             "build-depends": []
         },
         {
+            "name": "stage2-gawk",
+            "repo": "upstream:gawk",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc"
+            ]
+        },
+        {
+            "name": "stage2-make",
+            "repo": "upstream:make",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc"
+            ]
+        },
+        {
+            "name": "fhs-dirs",
+            "repo": "baserock:baserock/fhs-dirs",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib"
+            ]
+        },
+        {
             "name": "linux-api-headers",
             "repo": "upstream:linux",
-            "ref": "baserock/build-essential",
-            "build-depends": []
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib"
+            ]
+        },
+        {
+            "name": "eglibc",
+            "repo": "upstream:eglibc2",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "linux-api-headers"
+            ]
+        },
+        {
+            "name": "zlib",
+            "repo": "upstream:zlib",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc"
+            ]
+        },
+        {
+            "name": "binutils",
+            "repo": "upstream:binutils-redhat",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
+            ]
+        },
+        {
+            "name": "busybox",
+            "repo": "upstream:busybox",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc"
+            ]
         },
         {
             "name": "gawk",
             "repo": "upstream:gawk",
-            "ref": "baserock/build-essential",
-            "build-depends": []
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc"
+            ]
+        },
+        {
+            "name": "gcc",
+            "repo": "upstream:gcc-tarball",
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
+            ]
         },
         {
             "name": "make",
             "repo": "upstream:make",
-            "ref": "baserock/build-essential",
-            "build-depends": []
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc"
+            ]
         },
         {
             "name": "ccache",
             "repo": "upstream:ccache",
-            "ref": "baserock/build-essential",
-            "build-depends": []
+            "ref": "baserock/samthursfield/build-essential-2-rebase",
+            "build-mode": "staging",
+            "prefix": "/usr",
+            "build-depends": [
+                "stage2-binutils",
+                "stage2-busybox",
+                "stage2-eglibc",
+                "stage2-fhs-dirs",
+                "stage2-gawk",
+                "stage2-gcc",
+                "stage2-linux-api-headers",
+                "stage2-make",
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
+            ]
         }
     ]
 }