diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-09-22 12:56:26 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-10 15:55:25 +0000 |
| commit | 4d296778c123125f279691993a86160e90fa6097 (patch) | |
| tree | 4d1127a880ba96486cb02a79bd4d6ec17286d964 /systems | |
| parent | 7d65bfe4e33198d88dc3e1b11f78e498fc1f1521 (diff) | |
| download | definitions-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.
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/gitlab-ci-runner.morph | 2 | ||||
| -rw-r--r-- | systems/gitlab-server.morph | 2 | ||||
| -rw-r--r-- | systems/trove-system-x86_64.morph | 2 | ||||
| -rw-r--r-- | systems/web-system-x86_64-generic.morph | 2 |
4 files changed, 8 insertions, 0 deletions
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 |