summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-09-22 12:56:26 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-11-10 15:55:25 +0000
commit4d296778c123125f279691993a86160e90fa6097 (patch)
tree4d1127a880ba96486cb02a79bd4d6ec17286d964
parent7d65bfe4e33198d88dc3e1b11f78e498fc1f1521 (diff)
downloaddefinitions-4d296778c123125f279691993a86160e90fa6097.tar.gz
Split PCRE out into its own stratum
We need PCRE in multiple places, so rather than having multiple definitions, and potentially differing versions, let's use the same one from its own stratum. The need to add the stratum entry into the systems is annoying, and could probably do with a way of specifying that a stratum includes another, rather than just depends on it. Also, it seems a bit weird to have a stratum with only one chunk in it, but I can't think of a better way.
-rw-r--r--strata/pcre-utils.morph10
-rw-r--r--strata/trove.morph10
-rw-r--r--strata/webtools.morph9
-rw-r--r--systems/gitlab-ci-runner.morph2
-rw-r--r--systems/gitlab-server.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
-rw-r--r--systems/web-system-x86_64-generic.morph2
7 files changed, 22 insertions, 15 deletions
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..63180364 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
@@ -203,8 +198,7 @@ chunks:
repo: upstream:lighttpd
ref: 12e4e21763da770034267ff0a7b660876930f789
unpetrify-ref: baserock/morph
- build-depends:
- - pcre
+ build-depends: []
- 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: []
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index 919b3647..9e5fc1de 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -33,6 +33,8 @@ strata:
morph: strata/openstack-clients.morph
- name: databases
morph: strata/databases.morph
+- name: pcre
+ morph: strata/pcre-utils.morph
- name: webtools
morph: strata/webtools.morph
- name: ruby
diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph
index c78abe1c..e497731d 100644
--- a/systems/gitlab-server.morph
+++ b/systems/gitlab-server.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/nfs.morph
- name: databases
morph: strata/databases.morph
+- name: pcre
+ morph: strata/pcre-utils.morph
- name: webtools
morph: strata/webtools.morph
- name: ruby
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 297c9fb2..1ffcd676 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/tools.morph
- name: morph-utils
morph: strata/morph-utils.morph
+- name: pcre-utils
+ morph: strata/pcre-utils.morph
- name: trove
morph: strata/trove.morph
- name: nfs
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
index 1e6eba80..c4e61ef6 100644
--- a/systems/web-system-x86_64-generic.morph
+++ b/systems/web-system-x86_64-generic.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/nfs.morph
- name: databases
morph: strata/databases.morph
+- name: pcre
+ morph: strata/pcre-utils.morph
- name: webtools
morph: strata/webtools.morph
- name: erlang