Commit 29acdc09 authored by Nicolas Wavrant's avatar Nicolas Wavrant

pycurl: adds the component when needed to fulfill the new dependency of slapos.toolbox

Slapos.toolbox has a new dependency to pycurl, which fails to compile if libcurl cannot be found. This commit adds the component/pycurl dependency to most of the Software Releases which have a dependency to slapos.toolbox.

I tried to do it globally, so I couldn't check the compilation of all the modified SRs. Is it a way to test that all SRs still compiled ?

Also, did I forget some important SR ?

@rafael @alain.takoudjou @kazuhiko @jm 

/reviewed-on nexedi/slapos!97
parent e00b3042
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/pycurl/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
...@@ -34,6 +35,7 @@ mode = 0644 ...@@ -34,6 +35,7 @@ mode = 0644
[script] [script]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${pycurl:egg}
zc.buildout zc.buildout
slapos.core slapos.core
slapos.toolbox slapos.toolbox
......
...@@ -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/pycurl/buildout.cfg
../../component/python-cryptography/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
...@@ -39,6 +40,7 @@ recipe = zc.recipe.egg ...@@ -39,6 +40,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-cryptography:egg} ${python-cryptography:egg}
${pycurl:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
......
...@@ -14,6 +14,7 @@ extends = ...@@ -14,6 +14,7 @@ extends =
../../component/patch/buildout.cfg ../../component/patch/buildout.cfg
../../component/python-mysqlclient/buildout.cfg ../../component/python-mysqlclient/buildout.cfg
../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
../../component/pycurl/buildout.cfg
parts = parts =
# keep neoppod first so that ZODB3 is built correctly, # keep neoppod first so that ZODB3 is built correctly,
...@@ -47,6 +48,7 @@ eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests] ...@@ -47,6 +48,7 @@ eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg}
${python-PyYAML:egg} ${python-PyYAML:egg}
${python-cryptography:egg} ${python-cryptography:egg}
${python-cliff:egg} ${python-cliff:egg}
......
...@@ -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/pycurl/buildout.cfg
../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
...@@ -24,6 +25,7 @@ parts = ...@@ -24,6 +25,7 @@ parts =
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg}
${python-cryptography:egg} ${python-cryptography:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
......
...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
../../component/python-setuptools/buildout.cfg ../../component/python-setuptools/buildout.cfg
../../component/zlib/buildout.cfg ../../component/zlib/buildout.cfg
../../component/phantomjs/buildout.cfg ../../component/phantomjs/buildout.cfg
../../component/pycurl/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
...@@ -28,6 +29,7 @@ recipe = zc.recipe.egg ...@@ -28,6 +29,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-cryptography:egg} ${python-cryptography:egg}
${pycurl:egg}
Jinja2 Jinja2
erp5.util erp5.util
slapos.cookbook slapos.cookbook
......
...@@ -13,6 +13,7 @@ extends = ...@@ -13,6 +13,7 @@ extends =
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
../../component/openssh/buildout.cfg ../../component/openssh/buildout.cfg
../../component/rsync/buildout.cfg ../../component/rsync/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/screen/buildout.cfg ../../component/screen/buildout.cfg
../../component/shellinabox/buildout.cfg ../../component/shellinabox/buildout.cfg
...@@ -208,6 +209,7 @@ mode = 0644 ...@@ -208,6 +209,7 @@ mode = 0644
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${pycurl:egg}
collective.recipe.environment collective.recipe.environment
collective.recipe.template collective.recipe.template
cns.recipe.symlink cns.recipe.symlink
......
...@@ -11,6 +11,7 @@ extends = ...@@ -11,6 +11,7 @@ extends =
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/gzip/buildout.cfg ../../component/gzip/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/varnish/buildout.cfg ../../component/varnish/buildout.cfg
...@@ -96,6 +97,7 @@ scripts = ...@@ -96,6 +97,7 @@ scripts =
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg}
slapos.toolbox slapos.toolbox
scripts = scripts =
killpidfromfile killpidfromfile
......
...@@ -20,11 +20,13 @@ extends = ...@@ -20,11 +20,13 @@ extends =
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/pycurl/buildout.cfg
../slapos.cfg ../slapos.cfg
[instance-egg] [instance-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${pycurl:egg}
${python-mysqlclient:egg} ${python-mysqlclient:egg}
slapos.toolbox slapos.toolbox
......
...@@ -35,6 +35,7 @@ extends = ...@@ -35,6 +35,7 @@ extends =
../../component/rdiff-backup/buildout.cfg ../../component/rdiff-backup/buildout.cfg
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/dropbear/buildout.cfg ../../component/dropbear/buildout.cfg
../../component/pycurl/buildout.cfg
../slapos.cfg ../slapos.cfg
../resilient/buildout.cfg ../resilient/buildout.cfg
...@@ -176,6 +177,7 @@ recipe = zc.recipe.egg ...@@ -176,6 +177,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${psycopg2:egg} ${psycopg2:egg}
${pycurl:egg}
slapos.toolbox slapos.toolbox
[versions] [versions]
......
...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/gzip/buildout.cfg ../../component/gzip/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
parts = parts =
...@@ -39,6 +40,7 @@ on-update = true ...@@ -39,6 +40,7 @@ on-update = true
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg}
${python-cryptography:egg} ${python-cryptography:egg}
plone.recipe.command plone.recipe.command
collective.recipe.template collective.recipe.template
......
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