From a3cabfd4e14f373c0c04c4b6159f06b288eb7b26 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 18 Nov 2014 12:07:11 +0000 Subject: Separate `lorry` stratum out of 'trove' stratum. --- strata/lorry.morph | 129 +++++++++++++++++++++++++++++++++ strata/lorry/cvs-tarball.morph | 6 ++ strata/lorry/cvsps.morph | 6 ++ strata/lorry/hg-fast-export.morph | 10 +++ strata/lorry/libapr-util-tarball.morph | 5 ++ strata/lorry/lorry.morph | 3 + strata/lorry/mercurial-tarball.morph | 6 ++ strata/lorry/neon.morph | 8 ++ strata/lorry/perl-dbi-tarball.morph | 5 ++ strata/lorry/subversion-tarball.morph | 10 +++ strata/lorry/swig-tarball.morph | 5 ++ strata/trove.morph | 112 ---------------------------- strata/trove/cvs-tarball.morph | 6 -- strata/trove/cvsps.morph | 6 -- strata/trove/hg-fast-export.morph | 10 --- strata/trove/libapr-util-tarball.morph | 5 -- strata/trove/lorry.morph | 3 - strata/trove/mercurial-tarball.morph | 6 -- strata/trove/neon.morph | 8 -- strata/trove/perl-dbi-tarball.morph | 5 -- strata/trove/subversion-tarball.morph | 10 --- strata/trove/swig-tarball.morph | 5 -- systems/trove-system-x86_64.morph | 2 + 23 files changed, 195 insertions(+), 176 deletions(-) create mode 100644 strata/lorry.morph create mode 100644 strata/lorry/cvs-tarball.morph create mode 100644 strata/lorry/cvsps.morph create mode 100644 strata/lorry/hg-fast-export.morph create mode 100644 strata/lorry/libapr-util-tarball.morph create mode 100644 strata/lorry/lorry.morph create mode 100644 strata/lorry/mercurial-tarball.morph create mode 100644 strata/lorry/neon.morph create mode 100644 strata/lorry/perl-dbi-tarball.morph create mode 100644 strata/lorry/subversion-tarball.morph create mode 100644 strata/lorry/swig-tarball.morph delete mode 100644 strata/trove/cvs-tarball.morph delete mode 100644 strata/trove/cvsps.morph delete mode 100644 strata/trove/hg-fast-export.morph delete mode 100644 strata/trove/libapr-util-tarball.morph delete mode 100644 strata/trove/lorry.morph delete mode 100644 strata/trove/mercurial-tarball.morph delete mode 100644 strata/trove/neon.morph delete mode 100644 strata/trove/perl-dbi-tarball.morph delete mode 100644 strata/trove/subversion-tarball.morph delete mode 100644 strata/trove/swig-tarball.morph diff --git a/strata/lorry.morph b/strata/lorry.morph new file mode 100644 index 00000000..158071cc --- /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/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph new file mode 100644 index 00000000..e8322017 --- /dev/null +++ b/strata/lorry/cvs-tarball.morph @@ -0,0 +1,6 @@ +name: cvs-tarball +kind: chunk +build-system: autotools +configure-commands: +- YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi + --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath diff --git a/strata/lorry/cvsps.morph b/strata/lorry/cvsps.morph new file mode 100644 index 00000000..ff53784e --- /dev/null +++ b/strata/lorry/cvsps.morph @@ -0,0 +1,6 @@ +name: cvsps +kind: chunk +build-commands: +- make +install-commands: +- make install prefix="$DESTDIR$PREFIX" diff --git a/strata/lorry/hg-fast-export.morph b/strata/lorry/hg-fast-export.morph new file mode 100644 index 00000000..ef99a97a --- /dev/null +++ b/strata/lorry/hg-fast-export.morph @@ -0,0 +1,10 @@ +name: hg-fast-export +kind: chunk +install-commands: +- install -d "$DESTDIR/$PREFIX/bin" +- install -m 0755 hg-fast-export.py "$DESTDIR/$PREFIX/bin/" +- install -m 0755 hg-reset.py "$DESTDIR/$PREFIX/bin/" +- install -m 0755 hg-fast-export.sh "$DESTDIR/$PREFIX/bin/hg-fast-export" +- install -m 0755 hg-reset.sh "$DESTDIR/$PREFIX/bin/hg-reset" +- install -d "$DESTDIR/$PREFIX/lib/python2.7/site-packages" +- install -m 0644 hg2git.py "$DESTDIR/$PREFIX/lib/python2.7/site-packages/" diff --git a/strata/lorry/libapr-util-tarball.morph b/strata/lorry/libapr-util-tarball.morph new file mode 100644 index 00000000..e34e3610 --- /dev/null +++ b/strata/lorry/libapr-util-tarball.morph @@ -0,0 +1,5 @@ +name: libapr-util-tarball +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config diff --git a/strata/lorry/lorry.morph b/strata/lorry/lorry.morph new file mode 100644 index 00000000..6b8cb355 --- /dev/null +++ b/strata/lorry/lorry.morph @@ -0,0 +1,3 @@ +name: lorry +kind: chunk +build-system: python-distutils diff --git a/strata/lorry/mercurial-tarball.morph b/strata/lorry/mercurial-tarball.morph new file mode 100644 index 00000000..03264f56 --- /dev/null +++ b/strata/lorry/mercurial-tarball.morph @@ -0,0 +1,6 @@ +name: mercurial-tarball +kind: chunk +build-commands: +- make build PREFIX="$PREFIX" +install-commands: +- make install-bin PREFIX="$PREFIX" DESTDIR="$DESTDIR" diff --git a/strata/lorry/neon.morph b/strata/lorry/neon.morph new file mode 100644 index 00000000..19f8e83f --- /dev/null +++ b/strata/lorry/neon.morph @@ -0,0 +1,8 @@ +name: neon +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh +- ./configure --prefix="$PREFIX" --with-ssl +install-commands: +- make install-lib install-headers install-config DESTDIR="$DESTDIR" diff --git a/strata/lorry/perl-dbi-tarball.morph b/strata/lorry/perl-dbi-tarball.morph new file mode 100644 index 00000000..9eb3a537 --- /dev/null +++ b/strata/lorry/perl-dbi-tarball.morph @@ -0,0 +1,5 @@ +name: perl-dbi-tarball +kind: chunk +build-system: cpan +build-commands: +- make -j1 diff --git a/strata/lorry/subversion-tarball.morph b/strata/lorry/subversion-tarball.morph new file mode 100644 index 00000000..cb416d53 --- /dev/null +++ b/strata/lorry/subversion-tarball.morph @@ -0,0 +1,10 @@ +name: subversion-tarball +kind: chunk +build-system: autotools +configure-commands: +- python gen-make.py build.conf +- ./configure --prefix="$PREFIX" --without-berkeley-db +install-commands: +- make install DESTDIR="$DESTDIR" +- make swig-pl +- make install-swig-pl DESTDIR="$DESTDIR" diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig-tarball.morph new file mode 100644 index 00000000..61f154a4 --- /dev/null +++ b/strata/lorry/swig-tarball.morph @@ -0,0 +1,5 @@ +name: swig-tarball +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" --disable-ccache diff --git a/strata/trove.morph b/strata/trove.morph index 3b285372..133e67fd 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/strata/trove/cvs-tarball.morph b/strata/trove/cvs-tarball.morph deleted file mode 100644 index e8322017..00000000 --- a/strata/trove/cvs-tarball.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: cvs-tarball -kind: chunk -build-system: autotools -configure-commands: -- YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi - --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath diff --git a/strata/trove/cvsps.morph b/strata/trove/cvsps.morph deleted file mode 100644 index ff53784e..00000000 --- a/strata/trove/cvsps.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: cvsps -kind: chunk -build-commands: -- make -install-commands: -- make install prefix="$DESTDIR$PREFIX" diff --git a/strata/trove/hg-fast-export.morph b/strata/trove/hg-fast-export.morph deleted file mode 100644 index ef99a97a..00000000 --- a/strata/trove/hg-fast-export.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: hg-fast-export -kind: chunk -install-commands: -- install -d "$DESTDIR/$PREFIX/bin" -- install -m 0755 hg-fast-export.py "$DESTDIR/$PREFIX/bin/" -- install -m 0755 hg-reset.py "$DESTDIR/$PREFIX/bin/" -- install -m 0755 hg-fast-export.sh "$DESTDIR/$PREFIX/bin/hg-fast-export" -- install -m 0755 hg-reset.sh "$DESTDIR/$PREFIX/bin/hg-reset" -- install -d "$DESTDIR/$PREFIX/lib/python2.7/site-packages" -- install -m 0644 hg2git.py "$DESTDIR/$PREFIX/lib/python2.7/site-packages/" diff --git a/strata/trove/libapr-util-tarball.morph b/strata/trove/libapr-util-tarball.morph deleted file mode 100644 index e34e3610..00000000 --- a/strata/trove/libapr-util-tarball.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: libapr-util-tarball -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config diff --git a/strata/trove/lorry.morph b/strata/trove/lorry.morph deleted file mode 100644 index 6b8cb355..00000000 --- a/strata/trove/lorry.morph +++ /dev/null @@ -1,3 +0,0 @@ -name: lorry -kind: chunk -build-system: python-distutils diff --git a/strata/trove/mercurial-tarball.morph b/strata/trove/mercurial-tarball.morph deleted file mode 100644 index 03264f56..00000000 --- a/strata/trove/mercurial-tarball.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: mercurial-tarball -kind: chunk -build-commands: -- make build PREFIX="$PREFIX" -install-commands: -- make install-bin PREFIX="$PREFIX" DESTDIR="$DESTDIR" diff --git a/strata/trove/neon.morph b/strata/trove/neon.morph deleted file mode 100644 index 19f8e83f..00000000 --- a/strata/trove/neon.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: neon -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh -- ./configure --prefix="$PREFIX" --with-ssl -install-commands: -- make install-lib install-headers install-config DESTDIR="$DESTDIR" diff --git a/strata/trove/perl-dbi-tarball.morph b/strata/trove/perl-dbi-tarball.morph deleted file mode 100644 index 9eb3a537..00000000 --- a/strata/trove/perl-dbi-tarball.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: perl-dbi-tarball -kind: chunk -build-system: cpan -build-commands: -- make -j1 diff --git a/strata/trove/subversion-tarball.morph b/strata/trove/subversion-tarball.morph deleted file mode 100644 index cb416d53..00000000 --- a/strata/trove/subversion-tarball.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: subversion-tarball -kind: chunk -build-system: autotools -configure-commands: -- python gen-make.py build.conf -- ./configure --prefix="$PREFIX" --without-berkeley-db -install-commands: -- make install DESTDIR="$DESTDIR" -- make swig-pl -- make install-swig-pl DESTDIR="$DESTDIR" diff --git a/strata/trove/swig-tarball.morph b/strata/trove/swig-tarball.morph deleted file mode 100644 index 61f154a4..00000000 --- a/strata/trove/swig-tarball.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: swig-tarball -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --disable-ccache diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index b4f2c537..e305c723 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 -- cgit v1.2.1