Firehose test commit

1 files changed, 11 insertions, 16 deletions

diff --git a/strata/lorry.morph b/strata/lorry.morph
index 4bd7258a..b3a0c779 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -12,23 +12,19 @@ description: |
 build-depends:
 - morph: strata/foundation.morph
 - morph: strata/python-cliapp.morph
-- morph: strata/pcre-utils.morph # for swig
 chunks:
 - name: bzr-tarball
   repo: upstream:bzr-tarball
   ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
   unpetrify-ref: baserock/morph
-  build-system: python-distutils
 - name: python-fastimport
   repo: upstream:python-fastimport
   ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
   unpetrify-ref: baserock/morph
-  build-system: python-distutils
 - name: bzr-fastimport
   repo: upstream:bzr-fastimport
   ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
   unpetrify-ref: baserock/morph
-  build-system: python-distutils
   build-depends:
   - bzr-tarball
   - python-fastimport
@@ -58,10 +54,9 @@ chunks:
   repo: upstream:perl-dbd-sqlite-tarball
   ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
   unpetrify-ref: baserock/morph
-  build-system: cpan
   build-depends:
   - perl-dbi-tarball
-- name: libserf
+- name: libserf-tarball
   morph: strata/lorry/libserf.morph
   repo: upstream:libserf-tarball
   ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
@@ -69,11 +64,11 @@ chunks:
   build-depends:
   - libapr
   - libapr-util
-- name: swig
-  morph: strata/lorry/swig.morph
-  repo: upstream:swig
-  ref: 4e23595704d6ddffe4e50ca41bbc90e4b8893f4d
-  unpetrify-ref: rel-3.0.6
+- name: swig-tarball
+  morph: strata/lorry/swig-tarball.morph
+  repo: upstream:swig-tarball
+  ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
+  unpetrify-ref: baserock/morph
 - name: neon
   morph: strata/lorry/neon.morph
   repo: upstream:neon
@@ -82,13 +77,13 @@ chunks:
 - name: subversion-tarball
   morph: strata/lorry/subversion-tarball.morph
   repo: upstream:subversion-tarball
-  ref: bb0ef45f7c46b0ae221b26265ef98a768c33f820
-  unpetrify-ref: subversion-1.8.13
+  ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0
+  unpetrify-ref: baserock/morph
   build-depends:
-  - swig
+  - swig-tarball
   - libapr
   - libapr-util
-  - libserf
+  - libserf-tarball
   - neon
 - name: mercurial-tarball
   morph: strata/lorry/mercurial-tarball.morph
@@ -110,7 +105,7 @@ chunks:
 - name: lorry
   morph: strata/lorry/lorry.morph
   repo: baserock:baserock/lorry
-  ref: 3455c3c77ca778527efbd4541d3be1fb09f37bcf
+  ref: 4fcff82742ce3325a860c060b597ff281872c594
   unpetrify-ref: master
   build-depends:
   - bzr-tarball