Merge branch 'rm/busyboxonly' into rm/systemd

3 files changed, 46 insertions, 225 deletions

diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph
index 9480a4d..2732e12 100644
--- a/bootstrap-pass1.morph
+++ b/bootstrap-pass1.morph
@@ -33,107 +33,51 @@
             "name": "gcc-bootstrap-pass1-2"
         },
         {
-            "repo": "zlib",
             "ref": "baserock/morph",
             "name": "zlib"
         },
         {
-            "repo": "file",
-            "ref": "baserock/morph",
-            "name": "file"
-        },
-        {
-            "repo": "ncurses",
             "ref": "baserock/bootstrap-pass1",
             "name": "ncurses"
         },
         {
-            "repo": "bash",
             "ref": "baserock/bootstrap-pass1",
             "name": "bash"
         },
         {
-            "repo": "bzip2",
             "ref": "baserock/morph",
-            "name": "bzip2"
-        },
-        {
-            "repo": "coreutils",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "coreutils"
-        },
-        {
-            "repo": "diffutils",
-            "ref": "baserock/bootstrap",
-            "name": "diffutils"
+            "name": "busybox"
         },
         {
-            "repo": "findutils",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "findutils"
+            "name": "patch",
+            "ref": "baserock/bootstrap-pass1"
         },
         {
-            "repo": "gawk",
             "ref": "baserock/morph",
             "name": "gawk"
         },
         {
-            "repo": "gettext",
             "ref": "baserock/bootstrap",
             "name": "gettext"
         },
         {
-            "repo": "grep",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "grep"
-        },
-        {
-            "repo": "gzip",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "gzip"
-        },
-        {
-            "repo": "m4",
             "ref": "baserock/bootstrap",
             "name": "m4"
         },
         {
-            "repo": "make",
             "ref": "baserock/morph",
             "name": "make"
         },
         {
-            "repo": "patch",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "patch"
-        },
-        {
-            "repo": "perl",
             "ref": "baserock/morph",
             "name": "perl"
         },
         {
-            "repo": "sed",
-            "ref": "baserock/bootstrap",
-            "name": "sed"
-        },
-        {
-            "repo": "tar",
-            "ref": "baserock/bootstrap-pass1",
-            "name": "tar"
-        },
-        {
             "repo": "texinfo-tarball",
             "ref": "baserock/bootstrap-pass1",
             "name": "texinfo-tarball"
         },
         {
-            "repo": "xz",
-            "ref": "baserock/morph",
-            "name": "xz"
-        },
-        {
-            "repo": "cpython",
             "ref": "baserock/morph-2.7",
             "name": "cpython"
         },
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index f10ee01..0fc5167 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -31,11 +31,7 @@
             "ref": "baserock/bootstrap"
         },
         {
-            "name": "sed",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "bzip2",
+            "name": "busybox",
             "ref": "baserock/morph"
         },
         {
@@ -43,28 +39,12 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "util-linux",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "psmisc",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "e2fsprogs",
-            "ref": "baserock/bootstrap"
-        },
-        {
             "name": "gperf",
             "ref": "baserock/morph"
         },
         {
             "name": "coreutils",
-            "ref": "baserock/bootstrap"
-        },
-        {
-            "name": "iana-etc",
-            "ref": "baserock/morph"
+            "ref": "rm/no-bb-overlap/bootstrap-pass2"
         },
         {
             "name": "m4",
@@ -75,12 +55,8 @@
             "ref": "baserock/bootstrap"
         },
         {
-            "name": "procps",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "grep",
-            "ref": "baserock/bootstrap"
+            "name": "patch",
+            "ref": "baserock/bootstrap-pass2"
         },
         {
             "name": "readline",
@@ -111,18 +87,10 @@
             "ref": "baserock/bootstrap"
         },
         {
-            "name": "diffutils",
-            "ref": "baserock/bootstrap"
-        },
-        {
             "name": "gawk",
             "ref": "baserock/morph"
         },
         {
-            "name": "findutils",
-            "ref": "baserock/bootstrap"
-        },
-        {
             "name": "help2man",
             "ref": "baserock/morph"
         },
@@ -187,65 +155,23 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "rsync",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "gzip",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "libpipeline",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "gmp",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "libnettle",
-            "repo": "lsh",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "gnutls",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "wget",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "make",
             "ref": "baserock/morph"
         },
         {
-            "name": "xz",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "patch",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "tar",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "texinfo-tarball",
             "ref": "baserock/morph"
         },
         {
-            "name": "vim",
+            "name": "openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "curl",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "openssl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [
+                "openssl"
+            ]
         },
         {
             "name": "cpython",
@@ -253,16 +179,10 @@
         },
         {
             "name": "cliapp",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "git",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "busybox-devel",
-            "repo": "busybox",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [
+                "python"
+            ]
         },
         {   
             "name": "linux-user-chroot",
@@ -275,8 +195,14 @@
             ]   
         },
         {
-            "name": "linux",
-            "ref": "baserock/morph"
+            "name": "git",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "curl",
+                "python",
+                "openssl",
+                "libexpat"
+            ]
         }
     ]
 }
diff --git a/devel.morph b/devel.morph
index a3a4cf6..bd5ebd2 100644
--- a/devel.morph
+++ b/devel.morph
@@ -35,11 +35,11 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "sed",
+            "name": "busybox",
             "ref": "baserock/morph"
         },
         {
-            "name": "bzip2",
+            "name": "patch",
             "ref": "baserock/morph"
         },
         {
@@ -47,24 +47,16 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "psmisc",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "e2fsprogs",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "gperf",
             "ref": "baserock/morph"
         },
         {
-            "name": "coreutils",
+            "name": "xz",
             "ref": "baserock/morph"
         },
         {
-            "name": "iana-etc",
-            "ref": "baserock/morph"
+            "name": "coreutils",
+            "ref": "rm/no-bb-overlap/morph"
         },
         {
             "name": "m4",
@@ -75,14 +67,6 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "procps",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "grep",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "readline",
             "ref": "baserock/morph"
         },
@@ -111,18 +95,10 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "diffutils",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "gawk",
             "ref": "baserock/morph"
         },
         {
-            "name": "findutils",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "help2man",
             "ref": "baserock/morph"
         },
@@ -152,47 +128,10 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "rsync",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "gzip",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "libpipeline",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "libnettle",
-            "repo": "lsh",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "gnutls",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "wget",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "make",
             "ref": "baserock/morph"
         },
         {
-            "name": "xz",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "patch",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "tar",
-            "ref": "baserock/morph"
-        },
-        {
             "name": "texinfo-tarball",
             "ref": "baserock/morph"
         },
@@ -205,12 +144,15 @@
             "ref": "baserock/morph"
         },
         {
-            "name": "curl",
+            "name": "openssl",
             "ref": "baserock/morph"
         },
         {
-            "name": "openssl",
-            "ref": "baserock/morph"
+            "name": "curl",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "openssl"
+            ]
         },
         {
             "name": "cpython",
@@ -218,11 +160,20 @@
         },
         {
             "name": "cliapp",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [
+                "python"
+            ]
         },
         {
             "name": "git",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [
+                "libexpat",
+                "openssl",
+                "curl",
+                "python"
+            ]
         },
         {
             "name": "nasm",