Commit 5cd8ff9f authored by Jérome Perrin's avatar Jérome Perrin

DREAM: erp5tesnode: develops

use dream branch from slapos when installing testnode
  for "wrapper script: workaround kernel limitation"
use dream_distributor branch for erp5.util

Conflicts:
	software/erp5testnode/software.cfg
parent fd4db2c9
...@@ -10,6 +10,9 @@ extends = ...@@ -10,6 +10,9 @@ extends =
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
parts = parts =
slapos-cookbook-develop
slapos-core-develop
erp5-util-develop
slapos-cookbook slapos-cookbook
template template
lxml-python lxml-python
...@@ -18,6 +21,31 @@ parts = ...@@ -18,6 +21,31 @@ parts =
git git
apache apache
[erp5-util-repository.git]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git
branch = dream_distributor
git-executable = ${git:location}/bin/git
develop = true
[erp5-util-develop]
recipe = zc.recipe.egg:develop
setup = ${erp5-util-repository.git:location}
[slapos.cookbook-repository]
branch = dream
[slapos.core-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.core.git
branch = master
git-executable = ${git:location}/bin/git
develop = true
[slapos-core-develop]
recipe = zc.recipe.egg:develop
setup = ${slapos.core-repository:location}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
...@@ -58,6 +86,7 @@ mode = 0644 ...@@ -58,6 +86,7 @@ mode = 0644
md5sum = 22ffc8e212dcf2db8ad94cf0e5ac4772 md5sum = 22ffc8e212dcf2db8ad94cf0e5ac4772
[versions] [versions]
erp5.util =
slapos.cookbook =
PyXML = 0.8.5 PyXML = 0.8.5
erp5.util = 0.4.42
slapos.recipe.template = 2.6 slapos.recipe.template = 2.6
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