.

component/ZODB/buildout.cfg

@@ -39,7 +39,6 @@ init =
   zc.buildout.easy_install.default_versions(self.buildout['versions'])
 
 
-
 # ZODB/scripts installs scripts from ZODB
 [ZODB/scripts]
 recipe  = zc.recipe.egg:scripts
@@ -54,7 +53,7 @@ repository = https://lab.nexedi.com/kirr/ZODB.git
 git-executable = ${git:location}/bin/git
 
 # ZODB4: we maintain our own 4-nxd branch with patches for wendelin.core to work
-# correctly. The patches are backports of what is in ZODB master (ZODB5) ... XXX
+# correctly. The patches are backports of what is in ZODB master (ZODB5).
 [ZODB4]
 recipe  = zc.recipe.egg:develop
 setup   = ${ZODB4-repository:location}

software/neoppod/software-common.cfg

@@ -42,19 +42,23 @@ recipe = zc.recipe.egg:develop
 setup = ${neoppod-repository:location}
 environment = neoppod-setup-env
 
-[neoppod]
-recipe = zc.recipe.egg
-eggs = neoppod[admin, ctl, master]
+# dependent eggs that must come through in-tree recipes
+intree-eggs =
   ${cython-zstd:egg}
   ${msgpack-python:egg}
   ${:adapter-egg}
-  psutil
   ${ZODB:egg}
-  zope.testing
   ${zodbtools:egg}
+adapter-egg = ${python-mysqlclient:egg}
+
+[neoppod]
+recipe = zc.recipe.egg
+eggs = neoppod[admin, ctl, master]
+  ${neoppod-develop:intree-eggs}
+  psutil
+  zope.testing
   coverage
   setproctitle
-adapter-egg = ${python-mysqlclient:egg}
 
 [download-base-neo]
 recipe = slapos.recipe.build:download

software/neoppod/sqlite-mixin.cfg

 # To be extended after software-common.cfg if only SQLite backend is wanted.
 
-[neoppod]
+[neoppod-develop]
 adapter-egg =
 
 [instance-common]