From fdb958609cdccc7ac05dccc777f5027291a8b070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 26 Aug 2020 08:22:47 +0200
Subject: [PATCH] stack/slapos: introduce slapos-toolbox-dependencies

section to install dependencies of slapos.toolbox using slapos libraries
---
 software/slapos-testing/software.cfg |  4 +++-
 stack/erp5/buildout.cfg              |  3 ++-
 stack/slapos-dev.cfg                 |  1 +
 stack/slapos.cfg                     | 13 ++++++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg
index 7cea01add..7e13a57c4 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 c39b8e2ac..0c467fa41 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 f5f4d5eb5..d454c6380 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 ac99332ac..46f89f3f3 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}
-- 
2.25.1