diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg index 7cea01adde7bc2a19b335382c006e263d2673486..7e13a57c4e03dc4dcf4f1187b08f92c348c46183 100644 --- a/software/slapos-testing/software.cfg +++ b/software/slapos-testing/software.cfg @@ -87,7 +87,9 @@ setup = ${slapos.recipe.template-repository:location} <= setup-develop-egg egg = slapos.toolbox[test] setup = ${slapos.toolbox-repository:location} -depends = ${slapos.core-setup:egg} +depends = + ${slapos.core-setup:egg} + ${slapos-toolbox-dependencies:eggs} [slapos.rebootstrap-setup] <= setup-develop-egg diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index c39b8e2acbe9e53a0d6d3663a52f9a4df852f3c5..0c467fa41fbf937ae75532880b72714494abd9f3 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -562,10 +562,11 @@ setup = ${erp5:location} [zodbpack] recipe = zc.recipe.egg eggs = - ${slapos-toolbox:dependencies} slapos.toolbox[zodbpack] scripts = zodbpack +depends = + ${slapos-toolbox-dependencies:eggs} [versions] # See ../../software/neoppod/software-common.cfg for versions common with NEO: diff --git a/stack/slapos-dev.cfg b/stack/slapos-dev.cfg index f5f4d5eb5c0aa6141324c0073df7feb95a43195e..d454c638051f88897a99fec028f3ed50684acfe2 100644 --- a/stack/slapos-dev.cfg +++ b/stack/slapos-dev.cfg @@ -21,6 +21,7 @@ develop = true recipe = zc.recipe.egg:develop egg = slapos.toolbox setup = ${slapos.toolbox-repository:location} +depends = ${slapos-toolbox-dependencies:eggs} [slapos.cookbook-repository] develop = true diff --git a/stack/slapos.cfg b/stack/slapos.cfg index ac99332ac104c31c7d04dcdbe3b5dfcb96c0d226..46f89f3f3e5180dde1dd7cdc850b5f57b4888158 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -102,16 +102,19 @@ eggs = ${python-cliff:egg} ${python-cryptography:egg} ${jsonschema:egg} - pyOpenSSL - slapos.cookbook # slapos.toolbox containing utilities [slapos-toolbox] recipe = zc.recipe.egg +eggs = slapos.toolbox +depends = ${slapos-toolbox-dependencies:eggs} + +[slapos-toolbox-dependencies] +# slapos.toolbox depends on eggs with C-extensions that needs to be +# installed with slapos provided libraries. This section installs all +# slapos.toolbox dependencies. +recipe = zc.recipe.egg eggs = - ${:dependencies} - slapos.toolbox -dependencies = ${lxml-python:egg} ${pycurl:egg} ${python-cryptography:egg}