diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-08-26 14:27:14 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-09-16 14:56:00 +0000 |
| commit | cdae3df4649cdb53bbfff8bc189054d0bd44b788 (patch) | |
| tree | 0f6918fcb69b0dc4504fe14df74078b36582f2dd | |
| parent | 39ee2d0954002b273d3de29d980f8e0105aa045d (diff) | |
| download | definitions-cdae3df4649cdb53bbfff8bc189054d0bd44b788.tar.gz | |
Add network-security stratum to ceph-service stratum build dependencies
| -rw-r--r-- | strata/ceph-service.morph | 15 | ||||
| -rw-r--r-- | strata/ceph-service/nspr.morph | 6 | ||||
| -rw-r--r-- | strata/ceph-service/nss.morph | 7 | ||||
| -rw-r--r-- | systems/ceph-service-x86_64-generic.morph | 2 |
4 files changed, 3 insertions, 27 deletions
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 79db626d..25d6712d 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -2,20 +2,8 @@ name: ceph-service kind: stratum build-depends: - morph: strata/foundation.morph +- morph: strata/network-security.morph chunks: -- name: nspr - morph: strata/ceph-service/nspr.morph - repo: upstream:nspr-hg - ref: a6ee84946475c1fb7624973af28163f6da247c0d - unpetrify-ref: baserock/morph - build-depends: [] -- name: nss - morph: strata/ceph-service/nss.morph - repo: upstream:nss - ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487 - unpetrify-ref: baserock/morph - build-depends: - - nspr - name: libaio morph: strata/ceph-service/libaio.morph repo: upstream:libaio @@ -71,7 +59,6 @@ chunks: build-depends: - libaio - gperftools - - nss - leveldb - libeditline - keyutils diff --git a/strata/ceph-service/nspr.morph b/strata/ceph-service/nspr.morph deleted file mode 100644 index a5224fb4..00000000 --- a/strata/ceph-service/nspr.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: nspr -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix=$PREFIX --with-mozilla --with-pthreads $([ $(uname -m) = x86_64 - ] && echo --enable-64bit) diff --git a/strata/ceph-service/nss.morph b/strata/ceph-service/nss.morph deleted file mode 100644 index c83fd174..00000000 --- a/strata/ceph-service/nss.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: nss -kind: chunk -max-jobs: 1 -build-system: autotools -configure-commands: -- NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --libdir="$PREFIX/lib" diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 567443c4..182cf0cd 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: network-security + morph: strata/network-security.morph - name: ceph-service morph: strata/ceph-service.morph configuration-extensions: |