diff options
author | Richard Maw <richard.maw@gmail.com> | 2014-11-12 11:02:32 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@gmail.com> | 2014-11-12 11:02:32 +0000 |
commit | 3383b4c8bfe99b296ca57d9a890f5e7ef5622cdf (patch) | |
tree | b3f01e7a895de726c5f8413864e831fdf4d1bc56 /strata | |
parent | c42e94f0a7dddf3df2dd14d6fb3283b81ee62d5d (diff) | |
parent | aa82df0fce07508020e43803d570f5f041ab5cac (diff) | |
download | definitions-3383b4c8bfe99b296ca57d9a890f5e7ef5622cdf.tar.gz |
Merge remote-tracking branch 'origin/baserock/richardmaw/split-out-lighttpd'
Reviewed-by: Adam Coldrick
Reviewed-by: Tom Pollard
Reviewed-by: Pedro Alvarez
Diffstat (limited to 'strata')
-rw-r--r-- | strata/lighttpd-server.morph | 13 | ||||
-rw-r--r-- | strata/lighttpd-server/lighttpd.morph (renamed from strata/trove/lighttpd.morph) | 0 | ||||
-rw-r--r-- | strata/pcre-utils.morph | 10 | ||||
-rw-r--r-- | strata/trove.morph | 14 | ||||
-rw-r--r-- | strata/webtools.morph | 9 |
5 files changed, 26 insertions, 20 deletions
diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph new file mode 100644 index 00000000..cf3dec19 --- /dev/null +++ b/strata/lighttpd-server.morph @@ -0,0 +1,13 @@ +name: lighttpd-server +kind: stratum +description: lighttpd web server +build-depends: +- morph: strata/tools.morph +- morph: strata/pcre-utils.morph +chunks: +- name: lighttpd + morph: strata/lighttpd-server/lighttpd.morph + repo: upstream:lighttpd + ref: 12e4e21763da770034267ff0a7b660876930f789 + unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/trove/lighttpd.morph b/strata/lighttpd-server/lighttpd.morph index ae371c52..ae371c52 100644 --- a/strata/trove/lighttpd.morph +++ b/strata/lighttpd-server/lighttpd.morph diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph new file mode 100644 index 00000000..44d0bab2 --- /dev/null +++ b/strata/pcre-utils.morph @@ -0,0 +1,10 @@ +name: pcre-utils +kind: stratum +build-depends: +- morph: strata/tools.morph +chunks: +- name: pcre + repo: upstream:pcre + ref: 2720152c58e13e7cc7403642ec33127101b9971b + unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/trove.morph b/strata/trove.morph index 08fd9f89..d0773314 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -4,6 +4,7 @@ description: Trove software build-depends: - morph: strata/tools.morph - morph: strata/morph-utils.morph +- morph: strata/pcre-utils.morph chunks: - name: lua morph: strata/trove/lua.morph @@ -48,18 +49,12 @@ chunks: build-depends: - lua - luxio -- name: pcre - repo: upstream:pcre - ref: 2720152c58e13e7cc7403642ec33127101b9971b - unpetrify-ref: baserock/morph - build-depends: [] - name: lrexlib-pcre morph: strata/trove/lrexlib-pcre.morph repo: upstream:lrexlib ref: 0524a6e3ab6d50cba63c8642a875e246de53d651 unpetrify-ref: baserock/morph build-depends: - - pcre - lua - name: gitano morph: strata/trove/gitano.morph @@ -198,13 +193,6 @@ chunks: ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081 unpetrify-ref: master build-depends: [] -- name: lighttpd - morph: strata/trove/lighttpd.morph - repo: upstream:lighttpd - ref: 12e4e21763da770034267ff0a7b660876930f789 - unpetrify-ref: baserock/morph - build-depends: - - pcre - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/webtools.morph b/strata/webtools.morph index da5e3338..fd893ae6 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -3,6 +3,7 @@ kind: stratum description: pip, node and other fun things build-depends: - morph: strata/tools.morph +- morph: strata/pcre-utils.morph chunks: - name: icu morph: strata/webtools/icu.morph @@ -26,15 +27,9 @@ chunks: ref: d4b691b743a91500cf49119d28a805db8313f129 unpetrify-ref: master build-depends: [] -- name: pcre - repo: upstream:pcre - ref: 2720152c58e13e7cc7403642ec33127101b9971b - unpetrify-ref: baserock/morph - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 - build-depends: - - pcre + build-depends: [] |