diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-02-24 16:05:02 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 15:05:05 +0000 |
| commit | 9484843dc4cc97cce35dd1cf2efd34b724c57f85 (patch) | |
| tree | 0f0a49caae930947b26e1230b68ed94281a2a24e | |
| parent | de50adf71a74a865baded6ce12bfe83564cc1fe7 (diff) | |
| download | morphs-9484843dc4cc97cce35dd1cf2efd34b724c57f85.tar.gz | |
Temporarily move tbdiff to 'trove' stratum
This should save on needless rebuilding.
| -rw-r--r-- | foundation.morph | 5 | ||||
| -rw-r--r-- | trove.morph | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/foundation.morph b/foundation.morph index 5d64ec2..5d652ba 100644 --- a/foundation.morph +++ b/foundation.morph @@ -95,11 +95,6 @@ chunks: name: openssh ref: baserock/morph repo: upstream:openssh -- build-depends: - - attr - name: tbdiff - ref: baserock/sam/trove-upgrades - repo: baserock:baserock/tbdiff description: Basic userland runtime system kind: stratum name: foundation diff --git a/trove.morph b/trove.morph index 43569d0..a7abdbd 100644 --- a/trove.morph +++ b/trove.morph @@ -6,6 +6,11 @@ build-depends: ref: null morph: tools chunks: +<<<<<<< HEAD +- name: tbdiff + repo: baserock:baserock/tbdiff + ref: baserock/sam/trove-upgrades + build-depends: [] - name: bottle repo: upstream:bottle ref: baserock/morph |