From 4d296778c123125f279691993a86160e90fa6097 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 22 Sep 2014 12:56:26 +0000 Subject: 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. --- strata/pcre-utils.morph | 10 ++++++++++ strata/trove.morph | 10 ++-------- strata/webtools.morph | 9 ++------- systems/gitlab-ci-runner.morph | 2 ++ systems/gitlab-server.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/web-system-x86_64-generic.morph | 2 ++ 7 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 strata/pcre-utils.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..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 -- cgit v1.2.1 From 26d6519348cf3d178d35f8f0c8a5257cc9b5ba15 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 22 Sep 2014 13:11:27 +0000 Subject: Move lighttpd out of trove.morph It would be nice to in-line the lighttpd morphology, but we can't do that yet. --- strata/lighttpd-server.morph | 13 +++++++++++++ strata/lighttpd-server/lighttpd.morph | 6 ++++++ strata/trove.morph | 6 ------ strata/trove/lighttpd.morph | 6 ------ systems/trove-system-x86_64.morph | 2 ++ 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 strata/lighttpd-server.morph create mode 100644 strata/lighttpd-server/lighttpd.morph delete mode 100644 strata/trove/lighttpd.morph 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/lighttpd-server/lighttpd.morph b/strata/lighttpd-server/lighttpd.morph new file mode 100644 index 00000000..ae371c52 --- /dev/null +++ b/strata/lighttpd-server/lighttpd.morph @@ -0,0 +1,6 @@ +name: lighttpd +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh +- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib diff --git a/strata/trove.morph b/strata/trove.morph index 63180364..d0773314 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -193,12 +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: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/trove/lighttpd.morph b/strata/trove/lighttpd.morph deleted file mode 100644 index ae371c52..00000000 --- a/strata/trove/lighttpd.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: lighttpd -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh -- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 1ffcd676..d603f531 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -19,6 +19,8 @@ strata: morph: strata/pcre-utils.morph - name: trove morph: strata/trove.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: nfs morph: strata/nfs.morph - name: ansible -- cgit v1.2.1 From aa82df0fce07508020e43803d570f5f041ab5cac Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 10 Nov 2014 15:54:52 +0000 Subject: Add lighttpd to web system --- systems/web-system-x86_64-generic.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index c4e61ef6..12eda4a6 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/databases.morph - name: pcre morph: strata/pcre-utils.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: webtools morph: strata/webtools.morph - name: erlang -- cgit v1.2.1