diff --git a/software/kumofs/software.cfg b/software/kumofs/software.cfg index 34e8e888e7f4663f4d13d56d0a9e846e387fd1ab..bfb36c2e604ae02340be1ae61eb2f3f2af2a36e8 100644 --- a/software/kumofs/software.cfg +++ b/software/kumofs/software.cfg @@ -1,13 +1,12 @@ [buildout] - -sources = sources -auto-checkout = kumofs +slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook +develop = + ${:slaposcookbook_recipe_location} extensions = slapos.tool.networkcache slapos.zcbworkarounds slapos.rebootstrap - mr.developer find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/ @@ -47,6 +46,11 @@ 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.6 eggs = ${instance-recipe:egg} @@ -59,6 +63,15 @@ url = ${:_profile_base_location_}/instance.cfg output = ${buildout:directory}/template.cfg mode = 0644 +[slaposcookbook] +recipe = plone.recipe.command +git_param =--quiet -b kumofs +git = ${git:location}/bin/git +location = ${buildout:parts-directory}/${:_buildout_section_name_} +stop-on-error = true +command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1; +update-command = cd ${:location} && ${git:location}/bin/git pull --quiet + [versions] # Required by: # slapos.cookbook==0.1