summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 11:00:06 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 11:00:06 +0000
commit532dbf4cba9bde9a706e9585bcc5ad2d3234e4ff (patch)
tree69f6e8824e90757815982fabd31bde3a528ca60a
parent29fb3a5d62e40869e4b2622498ec12e5811eadbb (diff)
parent321528ed71e0e0db30c453234b4f1e8eaaa3c9c3 (diff)
downloadinfrastructure-532dbf4cba9bde9a706e9585bcc5ad2d3234e4ff.tar.gz
Merge remote-tracking branch 'origin/baserock/pedroalvarez/pycrypto-fix-morphology' into jetson-mason
-rw-r--r--strata/python-common.morph2
-rw-r--r--strata/python-common/pycrypto.morph3
2 files changed, 4 insertions, 1 deletions
diff --git a/strata/python-common.morph b/strata/python-common.morph
index 5536e13c..e2f4b32a 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -5,7 +5,7 @@ build-depends:
- morph: strata/python-core.morph
chunks:
- name: pycrypto
- morph: strata/openstack-services/pycrypto.morph
+ morph: strata/python-common/pycrypto.morph
repo: upstream:python-packages/pycrypto
ref: af058ee6f5da391a05275470ab4a4a96aa22b350
unpetrify-ref: v2.7a1
diff --git a/strata/python-common/pycrypto.morph b/strata/python-common/pycrypto.morph
new file mode 100644
index 00000000..51cc00f0
--- /dev/null
+++ b/strata/python-common/pycrypto.morph
@@ -0,0 +1,3 @@
+name: pycrypto
+kind: chunk
+build-system: python-distutils