diff --git a/software/kumofs/software.cfg b/software/kumofs/software.cfg index a749b8f65844833135d815b9b5dc048d1377c691..281e895195c4f841ee1c7b54779fb6c60054d422 100644 --- a/software/kumofs/software.cfg +++ b/software/kumofs/software.cfg @@ -1,7 +1,4 @@ [buildout] -slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook -develop = - ${:slaposcookbook_recipe_location} extensions = slapos.zcbworkarounds @@ -27,8 +24,6 @@ parts += template libxslt eggs - instance-recipe-egg - checkrecipe # XXX: Workaround of SlapOS limitation # Unzippig of eggs is required, as SlapOS do not yet provide nicely working @@ -45,11 +40,6 @@ egg = slapos.cookbook module = kumofs [instance-recipe-egg] -# Just so buildout executes [slaposcookbook] before [eggs], as -# - [eggs] references [slaposcookbook] -# - [instance-recipe] needs [slaposcookbook] to be finished -# - we cannot rely on anything else being executed before [instance-recipe] -slaposcookbook_dummy = ${slaposcookbook:location} recipe = zc.recipe.egg python = python2.7 eggs = ${instance-recipe:egg} @@ -68,26 +58,14 @@ md5sum = 056a4af7128fd9e31da42c85cc039420 output = ${buildout:directory}/template.cfg mode = 0644 -[slaposcookbook] -recipe = plone.recipe.command -git_branch = kumofs -git = ${git:location}/bin/git -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -command = ${:git} clone --quiet -b ${:git_branch} http://git.erp5.org/repos/slapos.git ${:location} || exit 1; -update-command = cd ${:location} && ${git:location}/bin/git pull --quiet - -[checkrecipe] -recipe = plone.recipe.command -stop-on-error = true -update-command = ${:command} -command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link - [versions] +slapos.cookbook = 0.4 + erp5.recipe.cmmiforcei686 = 0.1.1 hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.download = 1.5.0 +# Required by slapos.cookbook==0.4 slapos.core = 0.2 collective.recipe.template = 1.8 netaddr = 0.7.5