Merge remote-tracking branch 'origin/master' into baserock/samthursfield/highbank-be

2 files changed, 15 insertions, 7 deletions

diff --git a/core.morph b/core.morph
index 5d94fbf..6914441 100644
--- a/core.morph
+++ b/core.morph
@@ -128,12 +128,19 @@
             ]
         },
         {
+            "name": "bzip2",
+            "repo": "upstream:bzip2",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
             "name": "cpython",
             "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7",
             "build-depends": [
                 "openssl",
-                "readline"
+                "readline",
+                "bzip2"
             ]
         },
         {
@@ -225,12 +232,6 @@
             ]
         },
         {
-            "name": "bzip2",
-            "repo": "upstream:bzip2",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
             "name": "gperf",
             "repo": "upstream:gperf",
             "ref": "baserock/morph",
diff --git a/nfs.morph b/nfs.morph
index ee6744e..4c88658 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -2,6 +2,13 @@
     "name": "nfs",
     "kind": "stratum",
     "description": "NFS utilities",
+    "build-depends": [
+        {
+            "repo": "baserock:baserock/morphs",
+            "ref": "master",
+            "morph": "core"
+        }
+    ],
     "chunks": [
         {
             "name": "libevent",