Commit 7b385712 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

build cryptography egg before building slapos.toolbox.

because the recent version of paramiko (>= 2.0.0), that is a part of
slapos.toolbox's dependencies, depends on cryptography insead of
pycrypto.
parent 2b696e7e
...@@ -11,6 +11,7 @@ extends = ...@@ -11,6 +11,7 @@ extends =
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/rdiff-backup/buildout.cfg ../../component/rdiff-backup/buildout.cfg
../../component/trafficserver/buildout.cfg ../../component/trafficserver/buildout.cfg
...@@ -37,6 +38,7 @@ parts += ...@@ -37,6 +38,7 @@ parts +=
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-cryptography:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../../component/pycurl/buildout.cfg ../../component/pycurl/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/wget/buildout.cfg ../../component/wget/buildout.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
../../component/fluentd/buildout.cfg ../../component/fluentd/buildout.cfg
...@@ -77,6 +78,7 @@ recipe = zc.recipe.egg ...@@ -77,6 +78,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg} ${pycurl:egg}
${python-cryptography:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
......
...@@ -15,7 +15,7 @@ extends = ...@@ -15,7 +15,7 @@ extends =
#END LXML #END LXML
../../component/patch/buildout.cfg ../../component/patch/buildout.cfg
../../component/python-mysqlclient/buildout.cfg ../../component/python-mysqlclient/buildout.cfg
../../component/pycrypto-python/buildout.cfg ../../component/python-cryptography/buildout.cfg
parts = parts =
# keep neoppod first so that ZODB3 is built correctly, # keep neoppod first so that ZODB3 is built correctly,
...@@ -50,7 +50,7 @@ recipe = zc.recipe.egg ...@@ -50,7 +50,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-PyYAML:egg} ${python-PyYAML:egg}
${pycrypto-python:egg} ${python-cryptography:egg}
${python-cliff:egg} ${python-cliff:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
......
...@@ -8,6 +8,7 @@ extends = ...@@ -8,6 +8,7 @@ extends =
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
...@@ -23,6 +24,7 @@ parts = ...@@ -23,6 +24,7 @@ parts =
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-cryptography:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
slapos-kill slapos-kill
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment