memcached : remove develop-egg and set version for slapos.cookbook

parent 85a9f802
[buildout] [buildout]
slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
develop =
${:slaposcookbook_recipe_location}
extensions = extensions =
slapos.zcbworkarounds slapos.zcbworkarounds
...@@ -11,7 +8,6 @@ find-links += ...@@ -11,7 +8,6 @@ find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
extends = extends =
../../component/git/buildout.cfg
../../component/memcached/buildout.cfg ../../component/memcached/buildout.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
...@@ -28,7 +24,6 @@ parts = ...@@ -28,7 +24,6 @@ parts =
libxslt libxslt
eggs eggs
instance-recipe-egg instance-recipe-egg
checkrecipe
# XXX: Workaround of SlapOS limitation # XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
...@@ -45,11 +40,6 @@ egg = slapos.cookbook ...@@ -45,11 +40,6 @@ egg = slapos.cookbook
module = memcached module = memcached
[instance-recipe-egg] [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 recipe = zc.recipe.egg
python = python2.7 python = python2.7
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
...@@ -68,30 +58,15 @@ md5sum = 837caf9897332a5f70c72438f1dc5bae ...@@ -68,30 +58,15 @@ md5sum = 837caf9897332a5f70c72438f1dc5bae
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[slaposcookbook]
recipe = plone.recipe.command
branch = memcached
git_param =--quiet -b ${:branch}
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
[checkrecipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[versions] [versions]
slapos.core = 0.2 slapos.cookbook = 0.4
# Required by slapos.cookbook==0.4
slapos.core = 0.2
collective.recipe.template = 1.8 collective.recipe.template = 1.8
slapos.slap = 1.2.dev-r4679 slapos.slap = 1.2.dev-r4679
netaddr = 0.7.5 netaddr = 0.7.5
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
setuptools = 0.6c12dev-r88795 setuptools = 0.6c12dev-r88795
hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.cmmi = 1.5.0
......
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