summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-19 11:29:35 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-19 11:29:35 (GMT)
commitc8278dc8d4e3c54613179963501ae27a09e01eda (patch)
treea4e5a3e43d38f60b2de500fc4ded8995d9b0dfc8
parentf4e9dd7d95080d9d48a282df7b0c8aeb602a439d (diff)
parent7e1cc5349c431b9fb69640c87fe57ee4ae6529e6 (diff)
downloaddefinitions-c8278dc8d4e3c54613179963501ae27a09e01eda.tar.gz
Merge remote-tracking branch 'origin/baserock/sam/add-lorry-to-devel'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
-rw-r--r--strata/lorry.morph129
-rw-r--r--strata/lorry/cvs-tarball.morph (renamed from strata/trove/cvs-tarball.morph)0
-rw-r--r--strata/lorry/cvsps.morph (renamed from strata/trove/cvsps.morph)0
-rw-r--r--strata/lorry/hg-fast-export.morph (renamed from strata/trove/hg-fast-export.morph)0
-rw-r--r--strata/lorry/libapr-util-tarball.morph (renamed from strata/trove/libapr-util-tarball.morph)0
-rw-r--r--strata/lorry/lorry.morph (renamed from strata/trove/lorry.morph)0
-rw-r--r--strata/lorry/mercurial-tarball.morph (renamed from strata/trove/mercurial-tarball.morph)0
-rw-r--r--strata/lorry/neon.morph (renamed from strata/trove/neon.morph)0
-rw-r--r--strata/lorry/perl-dbi-tarball.morph (renamed from strata/trove/perl-dbi-tarball.morph)0
-rw-r--r--strata/lorry/subversion-tarball.morph (renamed from strata/trove/subversion-tarball.morph)0
-rw-r--r--strata/lorry/swig-tarball.morph (renamed from strata/trove/swig-tarball.morph)0
-rw-r--r--strata/trove.morph112
-rw-r--r--systems/devel-system-armv7-chroot.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7-versatile.morph2
-rw-r--r--systems/devel-system-armv7-wandboard.morph2
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph2
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph2
-rw-r--r--systems/devel-system-ppc64-chroot.morph2
-rw-r--r--systems/devel-system-ppc64-generic.morph2
-rw-r--r--systems/devel-system-x86_32-chroot.morph2
-rw-r--r--systems/devel-system-x86_32-generic.morph2
-rw-r--r--systems/devel-system-x86_64-chroot.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
28 files changed, 161 insertions, 112 deletions
diff --git a/strata/lorry.morph b/strata/lorry.morph
new file mode 100644
index 0000000..158071c
--- /dev/null
+++ b/strata/lorry.morph
@@ -0,0 +1,129 @@
+name: lorry
+kind: stratum
+description: |
+ Lorry and tools for working with version control systems other than Git.
+
+ Lorry is a tool for creating and maintaining Git mirrors of source code
+ repositories, which aims to support most version control systems in use
+ by software projects that are used Baserock systems.
+
+ The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available
+ by this stratum.
+build-depends:
+# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at
+# build-time to generate its man page. Otherwise we could simply depend on
+# the 'foundation' stratum.
+- morph: strata/morph-utils.morph
+chunks:
+- name: bzr-tarball
+ repo: upstream:bzr-tarball
+ ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: python-fastimport
+ repo: upstream:python-fastimport
+ ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: bzr-fastimport
+ repo: upstream:bzr-fastimport
+ ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+- name: cvs-tarball
+ morph: strata/lorry/cvs-tarball.morph
+ repo: upstream:cvs-tarball
+ ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libapr-tarball
+ repo: upstream:libapr-tarball
+ ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libapr-util-tarball
+ morph: strata/lorry/libapr-util-tarball.morph
+ repo: upstream:libapr-util-tarball
+ ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+- name: perl-dbi-tarball
+ morph: strata/lorry/perl-dbi-tarball.morph
+ repo: upstream:perl-dbi-tarball
+ ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: perl-dbd-sqlite-tarball
+ repo: upstream:perl-dbd-sqlite-tarball
+ ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - perl-dbi-tarball
+- name: libserf-tarball
+ repo: upstream:libserf-tarball
+ ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+ - libapr-util-tarball
+- name: swig-tarball
+ morph: strata/lorry/swig-tarball.morph
+ repo: upstream:swig-tarball
+ ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: neon
+ morph: strata/lorry/neon.morph
+ repo: upstream:neon
+ ref: 837374e9d797e216f1de684595cefe791f67c0e4
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: subversion-tarball
+ morph: strata/lorry/subversion-tarball.morph
+ repo: upstream:subversion-tarball
+ ref: 351e074672d9aa6446d5829938b697a3d6b23266
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - swig-tarball
+ - libapr-tarball
+ - libapr-util-tarball
+ - libserf-tarball
+ - neon
+- name: mercurial-tarball
+ morph: strata/lorry/mercurial-tarball.morph
+ repo: upstream:mercurial-tarball
+ ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: hg-fast-export
+ morph: strata/lorry/hg-fast-export.morph
+ repo: upstream:hg-fast-export
+ ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - mercurial-tarball
+- name: cvsps
+ morph: strata/lorry/cvsps.morph
+ repo: upstream:cvsps
+ ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: lorry
+ morph: strata/lorry/lorry.morph
+ repo: baserock:baserock/lorry
+ ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
+ unpetrify-ref: master
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+ - bzr-fastimport
+ - perl-dbi-tarball
+ - perl-dbd-sqlite-tarball
+ - cvs-tarball
+ - cvsps
+ - subversion-tarball
+ - mercurial-tarball
+ - hg-fast-export
diff --git a/strata/trove/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph
index e832201..e832201 100644
--- a/strata/trove/cvs-tarball.morph
+++ b/strata/lorry/cvs-tarball.morph
diff --git a/strata/trove/cvsps.morph b/strata/lorry/cvsps.morph
index ff53784..ff53784 100644
--- a/strata/trove/cvsps.morph
+++ b/strata/lorry/cvsps.morph
diff --git a/strata/trove/hg-fast-export.morph b/strata/lorry/hg-fast-export.morph
index ef99a97..ef99a97 100644
--- a/strata/trove/hg-fast-export.morph
+++ b/strata/lorry/hg-fast-export.morph
diff --git a/strata/trove/libapr-util-tarball.morph b/strata/lorry/libapr-util-tarball.morph
index e34e361..e34e361 100644
--- a/strata/trove/libapr-util-tarball.morph
+++ b/strata/lorry/libapr-util-tarball.morph
diff --git a/strata/trove/lorry.morph b/strata/lorry/lorry.morph
index 6b8cb35..6b8cb35 100644
--- a/strata/trove/lorry.morph
+++ b/strata/lorry/lorry.morph
diff --git a/strata/trove/mercurial-tarball.morph b/strata/lorry/mercurial-tarball.morph
index 03264f5..03264f5 100644
--- a/strata/trove/mercurial-tarball.morph
+++ b/strata/lorry/mercurial-tarball.morph
diff --git a/strata/trove/neon.morph b/strata/lorry/neon.morph
index 19f8e83..19f8e83 100644
--- a/strata/trove/neon.morph
+++ b/strata/lorry/neon.morph
diff --git a/strata/trove/perl-dbi-tarball.morph b/strata/lorry/perl-dbi-tarball.morph
index 9eb3a53..9eb3a53 100644
--- a/strata/trove/perl-dbi-tarball.morph
+++ b/strata/lorry/perl-dbi-tarball.morph
diff --git a/strata/trove/subversion-tarball.morph b/strata/lorry/subversion-tarball.morph
index cb416d5..cb416d5 100644
--- a/strata/trove/subversion-tarball.morph
+++ b/strata/lorry/subversion-tarball.morph
diff --git a/strata/trove/swig-tarball.morph b/strata/lorry/swig-tarball.morph
index 61f154a..61f154a 100644
--- a/strata/trove/swig-tarball.morph
+++ b/strata/lorry/swig-tarball.morph
diff --git a/strata/trove.morph b/strata/trove.morph
index 3b28537..133e67f 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -69,118 +69,6 @@ chunks:
ref: acbf4a15e260c711094455dbef7c024f2553fd32
unpetrify-ref: baserock/morph
build-depends: []
-- name: bzr-tarball
- repo: upstream:bzr-tarball
- ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-fastimport
- repo: upstream:python-fastimport
- ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: bzr-fastimport
- repo: upstream:bzr-fastimport
- ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
- unpetrify-ref: baserock/morph
- build-depends:
- - bzr-tarball
- - python-fastimport
-- name: cvs-tarball
- morph: strata/trove/cvs-tarball.morph
- repo: upstream:cvs-tarball
- ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-tarball
- repo: upstream:libapr-tarball
- ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-util-tarball
- morph: strata/trove/libapr-util-tarball.morph
- repo: upstream:libapr-util-tarball
- ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
-- name: perl-dbi-tarball
- morph: strata/trove/perl-dbi-tarball.morph
- repo: upstream:perl-dbi-tarball
- ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: perl-dbd-sqlite-tarball
- repo: upstream:perl-dbd-sqlite-tarball
- ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
- unpetrify-ref: baserock/morph
- build-depends:
- - perl-dbi-tarball
-- name: libserf-tarball
- repo: upstream:libserf-tarball
- ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
- - libapr-util-tarball
-- name: swig-tarball
- morph: strata/trove/swig-tarball.morph
- repo: upstream:swig-tarball
- ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: neon
- morph: strata/trove/neon.morph
- repo: upstream:neon
- ref: 837374e9d797e216f1de684595cefe791f67c0e4
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: subversion-tarball
- morph: strata/trove/subversion-tarball.morph
- repo: upstream:subversion-tarball
- ref: 351e074672d9aa6446d5829938b697a3d6b23266
- unpetrify-ref: baserock/morph
- build-depends:
- - swig-tarball
- - libapr-tarball
- - libapr-util-tarball
- - libserf-tarball
- - neon
-- name: mercurial-tarball
- morph: strata/trove/mercurial-tarball.morph
- repo: upstream:mercurial-tarball
- ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: hg-fast-export
- morph: strata/trove/hg-fast-export.morph
- repo: upstream:hg-fast-export
- ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
- unpetrify-ref: baserock/morph
- build-depends:
- - mercurial-tarball
-- name: cvsps
- morph: strata/trove/cvsps.morph
- repo: upstream:cvsps
- ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: lorry
- morph: strata/trove/lorry.morph
- repo: baserock:baserock/lorry
- ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
- unpetrify-ref: master
- build-depends:
- - bzr-tarball
- - python-fastimport
- - bzr-fastimport
- - perl-dbi-tarball
- - perl-dbd-sqlite-tarball
- - cvs-tarball
- - cvsps
- - subversion-tarball
- - mercurial-tarball
- - hg-fast-export
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 9d4de4d..40c0731 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index a408b55..f34d397 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -24,6 +24,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 6e386a9..7ad8cac 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -24,6 +24,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 2797c00..6abba89 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -24,6 +24,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 3cb9386..5e04376 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index d83c46a..2532802 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 736033d..1ee4581 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 859f8ad..92674a2 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 804cf60..ddfd1f2 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -21,6 +21,8 @@ strata:
morph: strata/openstack-clients.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 6a9cb09..8aeaf26 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -22,6 +22,8 @@ strata:
morph: strata/openstack-clients.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 4c882c2..a54eef5 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index d6fb17e..ef5d4b9 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -26,6 +26,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 65a5307..84d63f5 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 5a16c90..9334fca 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -26,6 +26,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
- name: nfs
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 413c5b5..f2f849c 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -26,6 +26,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
configuration-extensions:
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index b4f2c53..e305c72 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/morph-utils.morph
- name: pcre-utils
morph: strata/pcre-utils.morph
+- name: lorry
+ morph: strata/lorry.morph
- name: trove
morph: strata/trove.morph
- name: lighttpd-server