summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-16 09:10:48 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-16 09:10:48 +0000
commit4147425344cab8b1117e42e3fa06dac05d0aed1d (patch)
treebefe96fc78104751fb3c1508382327cecc0c252d
parent421db9cfdcaab4b0e88892baa01b4d3f12bc242b (diff)
parent84941b8617f459a4927ad3b9e1a3d2e512e15af3 (diff)
downloaddefinitions-4147425344cab8b1117e42e3fa06dac05d0aed1d.tar.gz
Merge branch 'baserock/franred/update-memcached-add-python-adapters'
Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-by: Patrick Darley <patrick.darley@codethink.co.uk>
-rw-r--r--strata/databases.morph16
-rw-r--r--strata/databases/memcached.morph8
-rw-r--r--strata/nfs.morph4
3 files changed, 24 insertions, 4 deletions
diff --git a/strata/databases.morph b/strata/databases.morph
index cb09c5a3..4b06edf3 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -1,6 +1,6 @@
name: databases
kind: stratum
-description: some popular databases
+description: some popular databases and some utils related to databases
build-depends:
- morph: strata/tools.morph
- morph: strata/nfs.morph
@@ -17,7 +17,19 @@ chunks:
unpetrify-ref: baserock/3.0
build-depends: []
- name: memcached
+ morph: strata/databases/memcached.morph
repo: upstream:memcached
- ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
+ ref: c5530027c8ea28674358327ab8212ebaf014c848
+ unpetrify-ref: 1.4.22
+ build-depends: []
+- name: psycopg2
+ repo: upstream:python-packages/psycopg2
+ ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8
+ unpetrify-ref: 2.5.4
+ build-depends:
+ - postgresql
+- name: python-memcached
+ repo: upstream:python-packages/python-memcached
+ ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db
unpetrify-ref: master
build-depends: []
diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph
new file mode 100644
index 00000000..28e01362
--- /dev/null
+++ b/strata/databases/memcached.morph
@@ -0,0 +1,8 @@
+name: memcached
+kind: chunk
+build-system: autotools
+configure-commands:
+- perl version.pl
+- touch README
+- autoreconf -fvi
+- ./configure --prefix="$PREFIX"
diff --git a/strata/nfs.morph b/strata/nfs.morph
index 68988d54..3dbead9d 100644
--- a/strata/nfs.morph
+++ b/strata/nfs.morph
@@ -6,8 +6,8 @@ build-depends:
chunks:
- name: libevent
repo: upstream:libevent
- ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
- unpetrify-ref: baserock/release-2.0.21-stable
+ ref: 0b49ae34594533daa82c06a506078de9e336a013
+ unpetrify-ref: release-2.1.5-beta
build-depends: []
- name: ti-rpc
morph: strata/nfs/ti-rpc.morph