diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-05-07 11:45:26 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-05-07 11:45:26 +0100 |
commit | 5004cfb85a2789a1331850b2f4c29494b6d49aca (patch) | |
tree | b3d48bc0d81895f6bd11ff432095e404261ed4c9 | |
parent | 84e70fafe2568e5cf606cc700b140f62d371a4f9 (diff) | |
parent | 6d0b51531a2db8ceebb78e945c0d0d10b0b8f554 (diff) | |
download | definitions-5004cfb85a2789a1331850b2f4c29494b6d49aca.tar.gz |
Merge remote-tracking branch 'origin/master' into baserock/samthursfield/highbank-be
-rw-r--r-- | core.morph | 15 | ||||
-rw-r--r-- | nfs.morph | 7 |
2 files changed, 15 insertions, 7 deletions
@@ -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", @@ -2,6 +2,13 @@ "name": "nfs", "kind": "stratum", "description": "NFS utilities", + "build-depends": [ + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "core" + } + ], "chunks": [ { "name": "libevent", |