Merge remote-tracking branch 'origin/master' into danielsilverstone/slab-msom-morphs

9 files changed, 216 insertions, 112 deletions

diff --git a/arm-versatile-bsp.morph b/arm-versatile-bsp.morph
index 06aa291..50de2cf 100644
--- a/arm-versatile-bsp.morph
+++ b/arm-versatile-bsp.morph
@@ -6,7 +6,8 @@
         {
             "name": "linux",
             "repo": "upstream:linux",
-            "ref": "baserock/arm/versatile"
+            "ref": "baserock/arm/versatile",
+            "build-depends": []
         }
     ]
 }
diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph
index efaca0e..9433e60 100644
--- a/bootstrap-pass1.morph
+++ b/bootstrap-pass1.morph
@@ -6,97 +6,116 @@
         {
             "repo": "upstream:binutils-redhat",
             "ref": "baserock/bootstrap-pass1",
-            "name": "binutils-1"
+            "name": "binutils-1",
+            "build-depends": []
         },
         {
             "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap-pass1-1",
-            "name": "gcc-bootstrap-pass1-1"
+            "name": "gcc-bootstrap-pass1-1",
+            "build-depends": ["binutils-1"]
         },
         {
             "repo": "upstream:linux",
             "ref": "baserock/3.2-headers",
-            "name": "linux-api-headers"
+            "name": "linux-api-headers",
+            "build-depends": ["gcc-bootstrap-pass1-1"]
         },
         {
             "repo": "upstream:eglibc2",
             "ref": "baserock/2.15-bootstrap-pass1",
-            "name": "eglibc"
+            "name": "eglibc",
+            "build-depends": ["linux-api-headers"]
         },
         {
             "repo": "upstream:binutils-redhat",
             "ref": "baserock/bootstrap-pass1",
-            "name": "binutils-2"
+            "name": "binutils-2",
+            "build-depends": ["eglibc"]
         },
         {
             "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap-pass1-2",
-            "name": "gcc-bootstrap-pass1-2"
+            "name": "gcc-bootstrap-pass1-2",
+            "build-depends": ["binutils-2"]
         },
         {
             "repo": "upstream:zlib",
             "ref": "baserock/morph",
-            "name": "zlib"
+            "name": "zlib",
+            "build-depends": ["gcc-bootstrap-pass1-2"]
         },
         {
             "repo": "upstream:ncurses",
             "ref": "baserock/bootstrap-pass1",
-            "name": "ncurses"
+            "name": "ncurses",
+            "build-depends": ["zlib"]
         },
         {
             "repo": "upstream:bash",
             "ref": "baserock/bootstrap-pass1",
-            "name": "bash"
+            "name": "bash",
+            "build-depends": ["ncurses"]
         },
         {
             "repo": "upstream:busybox",
             "ref": "baserock/morph",
-            "name": "busybox"
+            "name": "busybox",
+            "build-depends": ["bash"]
         },
         {
             "repo": "upstream:gawk",
             "ref": "baserock/morph",
-            "name": "gawk"
+            "name": "gawk",
+            "build-depends": ["busybox"]
         },
         {
             "repo": "upstream:gettext",
             "ref": "baserock/bootstrap",
-            "name": "gettext"
+            "name": "gettext",
+            "build-depends": ["gawk"]
         },
         {
             "repo": "upstream:m4",
             "ref": "baserock/bootstrap",
-            "name": "m4"
+            "name": "m4",
+            "build-depends": ["gettext"]
         },
         {
             "repo": "upstream:make",
             "ref": "baserock/morph",
-            "name": "make"
+            "name": "make",
+            "build-depends": ["m4"]
         },
         {
             "repo": "upstream:patch",
             "ref": "baserock/bootstrap-pass1",
-            "name": "patch"
+            "name": "patch",
+            "build-depends": ["make"]
         },
         {
             "repo": "upstream:perl",
             "ref": "baserock/morph",
-            "name": "perl"
+            "name": "perl",
+            "build-depends": ["patch"]
         },
         {
             "repo": "upstream:texinfo-tarball",
             "ref": "baserock/bootstrap-pass1",
-            "name": "texinfo-tarball"
+            "name": "texinfo-tarball",
+            "build-depends": ["perl"]
         },
         {
             "repo": "upstream:xz",
             "ref": "baserock/morph",
-            "name": "xz"
+            "name": "xz",
+            "build-depends": ["texinfo-tarball"]
         },
         {
             "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7",
-            "name": "cpython"
+            "name": "cpython",
+            "build-depends": ["xz"]
         },
         {
             "repo": "upstream:cliapp",
@@ -109,7 +128,8 @@
         {
             "name": "openssl",
             "repo": "upstream:openssl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["cliapp"]
         },
         {
             "name": "curl",
@@ -122,7 +142,8 @@
         {
             "name": "libexpat",
             "repo": "upstream:libexpat",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["curl"]
         },
         {
             "repo": "upstream:git",
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index 1f15fcc..0b20499 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -6,138 +6,165 @@
         {
             "name": "fhs-dirs",
             "repo": "baserock:fhs-dirs",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": []
         },
         {
             "name": "linux-api-headers",
             "repo": "upstream:linux",
-            "ref": "baserock/3.2-headers"
+            "ref": "baserock/3.2-headers",
+            "build-depends": ["fhs-dirs"]
         },
         {
             "name": "eglibc",
             "morph": "eglibc",
             "repo": "upstream:eglibc2",
-            "ref": "baserock/2.15-morph"
+            "ref": "baserock/2.15-morph",
+            "build-depends": ["linux-api-headers"]
         },
         {
             "name": "zlib",
             "repo": "upstream:zlib",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["eglibc"]
         },
         {
             "name": "binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/bootstrap-pass2"
+            "ref": "baserock/bootstrap-pass2",
+            "build-depends": ["zlib"]
         },
         {
             "name": "gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["binutils"]
         },
         {
             "name": "busybox",
             "repo": "upstream:busybox",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["gcc"]
         },
         {
             "name": "ncurses",
             "repo": "upstream:ncurses",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["busybox"]
         },
         {
             "name": "util-linux",
             "repo": "upstream:util-linux",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["ncurses"]
         },
         {
             "name": "gperf",
             "repo": "upstream:gperf",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["util-linux"]
         },
         {
             "name": "coreutils",
             "repo": "upstream:coreutils",
-            "ref": "rm/no-bb-overlap/bootstrap-pass2"
+            "ref": "rm/no-bb-overlap/bootstrap-pass2",
+            "build-depends": ["gperf"]
         },
         {
             "name": "m4",
             "repo": "upstream:m4",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["coreutils"]
         },
         {
             "name": "bison",
             "repo": "upstream:bison",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["m4"]
         },
         {
             "name": "patch",
             "repo": "upstream:patch",
-            "ref": "baserock/bootstrap-pass2"
+            "ref": "baserock/bootstrap-pass2",
+            "build-depends": ["bison"]
         },
         {
             "name": "readline",
             "repo": "upstream:readline",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["patch"]
         },
         {
             "name": "bash",
             "repo": "upstream:bash",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["readline"]
         },
         {
             "name": "gdbm",
             "repo": "upstream:gdbm",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["bash"]
         },
         {
             "name": "perl",
             "repo": "upstream:perl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["gdbm"]
         },
         {
             "name": "autoconf",
             "repo": "upstream:autoconf",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["perl"]
         },
         {
             "name": "automake",
             "repo": "upstream:automake",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["autoconf"]
         },
         {
             "name": "libtool",
             "repo": "upstream:libtool",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["automake"]
         },
         {
             "name": "gawk",
             "repo": "upstream:gawk",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["libtool"]
         },
         {
             "name": "help2man",
             "repo": "upstream:help2man",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["gawk"]
         },
         {
             "name": "flex",
             "repo": "upstream:flex",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["help2man"]
         },
         {
             "name": "gettext",
             "repo": "upstream:gettext",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["flex"]
         },
         {
             "name": "pkg-config",
             "repo": "upstream:pkg-config",
-            "ref": "baserock/bootstrap"
+            "ref": "baserock/bootstrap",
+            "build-depends": ["gettext"]
         },
         {
             "name": "xz",
             "repo": "upstream:xz",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["pkg-config"]
         },
         {
             "name": "libexpat",
@@ -160,7 +187,8 @@
         {
             "name": "intltool",
             "repo": "upstream:intltool",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["XML-Parser"]
         },
         {
             "name": "gtk-doc-stub",
@@ -192,22 +220,26 @@
         {
             "name": "groff",
             "repo": "upstream:groff",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["glib"]
         },
         {
             "name": "make",
             "repo": "upstream:make",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["groff"]
         },
         {
             "name": "texinfo-tarball",
             "repo": "upstream:texinfo-tarball",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["make"]
         },
         {
             "name": "openssl",
             "repo": "upstream:openssl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["texinfo-tarball"]
         },
         {
             "name": "curl",
@@ -220,7 +252,8 @@
         {
             "name": "cpython",
             "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7"
+            "ref": "baserock/morph-2.7",
+            "build-depends": ["curl"]
         },
         {
             "name": "cliapp",
diff --git a/devel.morph b/devel.morph
index bd2d134..5b1e824 100644
--- a/devel.morph
+++ b/devel.morph
@@ -6,139 +6,172 @@
         {
             "name": "linux-api-headers",
             "repo": "upstream:linux",
-            "ref": "baserock/3.2-headers"
+            "ref": "baserock/3.2-headers",
+            "build-depends": []
         },
         {
             "name": "eglibc",
             "repo": "upstream:eglibc2",
             "morph": "eglibc",
-            "ref": "baserock/2.15-morph"
+            "ref": "baserock/2.15-morph",
+            "build-depends": [ "linux-api-headers" ]
         },
         {
             "name": "binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "eglibc" ]
         },
         {
             "name": "gmp",
             "repo": "upstream:gmp",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "eglibc" ]
         },
         {
             "name": "mpfr",
             "repo": "upstream:mpfr",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "gmp" ]
         },
         {
             "name": "mpc",
             "repo": "upstream:mpc",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "mpfr" ]
         },
         {
             "name": "gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "mpc", "binutils", "eglibc" ]
+        },
+        {
+            "name": "make",
+            "repo": "upstream:make",
+            "ref": "baserock/morph",
+            "build-depends": [ "gcc" ]
         },
         {
             "name": "patch",
             "repo": "upstream:patch",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "ncurses",
             "repo": "upstream:ncurses",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "gperf",
             "repo": "upstream:gperf",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "xz",
             "repo": "upstream:xz",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "coreutils",
             "repo": "upstream:coreutils",
-            "ref": "rm/no-bb-overlap/morph"
+            "ref": "rm/no-bb-overlap/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "m4",
             "repo": "upstream:m4",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "bison",
             "repo": "upstream:bison",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "readline",
             "repo": "upstream:readline",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make", "ncurses" ]
         },
         {
             "name": "bash",
             "repo": "upstream:bash",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make", "readline" ]
         },
         {
             "name": "gdbm",
             "repo": "upstream:gdbm",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "perl",
             "repo": "upstream:perl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make", "gdbm" ]
         },
         {
             "name": "autoconf",
             "repo": "upstream:autoconf",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "m4" ]
         },
         {
             "name": "automake",
             "repo": "upstream:automake",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "autoconf", "perl" ]
         },
         {
             "name": "libtool",
             "repo": "upstream:libtool",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "bash" ]
         },
         {
             "name": "gawk",
             "repo": "upstream:gawk",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "help2man",
             "repo": "upstream:help2man",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "perl" ]
         },
         {
             "name": "flex",
             "repo": "upstream:flex",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "gettext",
             "repo": "upstream:gettext",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make", "perl" ]
         },
         {
             "name": "pkg-config",
             "repo": "upstream:pkg-config",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "linux-user-chroot",
             "repo": "upstream:linux-user-chroot",
             "ref": "master",
             "build-depends": [
+                "make",
                 "autoconf",
                 "automake",
                 "libtool"
@@ -147,12 +180,8 @@
         {
             "name": "groff",
             "repo": "upstream:groff",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "make",
-            "repo": "upstream:make",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "gtk-doc-stub",
@@ -174,25 +203,29 @@
         {
             "name": "vim",
             "repo": "upstream:vim",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make", "ncurses", "texinfo-tarball" ]
         },
         {
             "name": "openssl",
             "repo": "upstream:openssl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": [ "make" ]
         },
         {
             "name": "curl",
             "repo": "upstream:curl",
             "ref": "baserock/morph",
             "build-depends": [
+                "make",
                 "openssl"
             ]
         },
         {
             "name": "cpython",
             "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7"
+            "ref": "baserock/morph-2.7",
+            "build-depends": [ "make", "readline", "openssl" ]
         },
         {
             "name": "cliapp",
@@ -207,6 +240,7 @@
             "repo": "upstream:git",
             "ref": "baserock/morph",
             "build-depends": [
+                "make",
                 "openssl",
                 "curl",
                 "cpython"
@@ -217,6 +251,7 @@
             "repo": "upstream:openssh",
             "ref": "baserock/morph",
             "build-depends": [
+                "make",
                 "autoconf",
                 "automake",
                 "libtool",
@@ -225,14 +260,6 @@
             ]
         },
         {
-            "name": "nasm",
-            "repo": "upstream:nasm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf"
-            ]
-        },
-        {
             "name": "python-setuptools",
             "repo": "upstream:python-setuptools",
             "ref": "baserock/morph",
@@ -278,7 +305,8 @@
         {
             "name": "libxml2",
             "repo": "upstream:libxml2",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": [ "make" ]
         },
         {
             "name": "libxslt",
@@ -291,7 +319,8 @@
         {
             "name": "XML-Parser",
             "repo": "upstream:XML-Parser",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": [ "make", "perl", "libxml2" ]
         },
         {
             "name": "intltool",
diff --git a/foundation.morph b/foundation.morph
index bc906a2..60f79af 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -6,7 +6,8 @@
         {
             "name": "fhs-dirs",
             "repo": "baserock:fhs-dirs",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": []
         },
         {
             "name": "eglibc",
@@ -60,6 +61,7 @@
             "repo": "upstream:libcap2",
             "ref": "baserock/morph",
             "build-depends": [
+                "eglibc",
                 "attr"
             ]
         },
@@ -68,7 +70,8 @@
             "repo": "upstream:btrfs-progs",
             "ref": "baserock/morph",
             "build-depends": [
-                "eglibc"
+                "eglibc",
+                "attr"
             ]
         },
         {
@@ -93,6 +96,7 @@
             "repo": "git://github.com/gregkh/usbutils.git",
             "ref": "master",
             "build-depends": [
+                "eglibc",
                 "libusb"
             ]
         },
@@ -125,6 +129,7 @@
             "repo": "upstream:glib",
             "ref": "master",
             "build-depends": [
+                "eglibc",
                 "libffi"
             ]
         },
diff --git a/imx53-bsp.morph b/imx53-bsp.morph
index 373a96a..d7d6f8d 100644
--- a/imx53-bsp.morph
+++ b/imx53-bsp.morph
@@ -6,7 +6,8 @@
         {
             "name": "linux",
             "repo": "upstream:linux",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": []
         }
     ]
 }
diff --git a/morph-cache-server.morph b/morph-cache-server.morph
index 37ab90a..22adc83 100644
--- a/morph-cache-server.morph
+++ b/morph-cache-server.morph
@@ -6,32 +6,38 @@
         {
             "name": "git",
             "repo": "upstream:git",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": []
         },
         {
             "name": "openssl",
             "repo": "upstream:openssl",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": []
         },
         {
             "name": "cpython",
             "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7"
+            "ref": "baserock/morph-2.7",
+            "build-depends": ["openssl"]
         },
         {
             "name": "cliapp",
             "repo": "upstream:cliapp",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": ["cpython"]
         },
         {
             "name": "bottle",
             "repo": "github:defnull/bottle",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": ["cpython"]
         },
         {
             "name": "morph-cache-server",
             "repo": "baserock:morph-cache-server",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": ["cpython", "cliapp"]
         }
     ]
 }
diff --git a/scripting.morph b/scripting.morph
index 4dd2a18..ed97c30 100644
--- a/scripting.morph
+++ b/scripting.morph
@@ -6,7 +6,8 @@
         {
             "name": "lua",
             "repo": "upstream:lua",
-            "ref": "baserock/5.1-morph"
+            "ref": "baserock/5.1-morph",
+            "build-depends": []
         }
     ]
 }
diff --git a/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph
index 525ca9f..5063127 100644
--- a/x86_64-generic-bsp.morph
+++ b/x86_64-generic-bsp.morph
@@ -6,13 +6,20 @@
         {
             "name": "linux",
             "repo": "upstream:linux",
-            "ref": "baserock/morph"
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "nasm",
+            "repo": "upstream:nasm",
+            "ref": "baserock/morph",
+            "build-depends": []
         },
         {
             "name": "syslinux",
             "repo": "upstream:syslinux",
             "ref": "baserock/morph",
-            "build-depends": []
+            "build-depends": ["nasm"]
         }
     ]
 }