From 7066b761d447cf3fc0223a7f9cee07214b85ec6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 7 Jun 2011 16:32:31 +0200
Subject: [PATCH] Memcached Software Release : Add missing lxml egg, updating
versions, updating md5
---
software/memcached/software.cfg | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/software/memcached/software.cfg b/software/memcached/software.cfg
index c40fdd39..939c0773 100644
--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
@@ -14,10 +14,10 @@ find-links +=
extends =
../../component/git/buildout.cfg
../../component/memcached/buildout.cfg
+ ../../component/python-2.6/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/dcron/buildout.cfg
../../component/stunnel/buildout.cfg
- ../../component/python-2.7/buildout.cfg
../../component/rdiff-backup/buildout.cfg
versions = versions
@@ -26,6 +26,7 @@ parts +=
# Create instance template
#TODO : list here all parts.
template
+ eggs
instance-recipe-egg
# XXX: Workaround of SlapOS limitation
@@ -49,14 +50,20 @@ module = memcached
# - we cannot rely on anything else being executed before [instance-recipe]
slaposcookbook_dummy = ${slaposcookbook:location}
recipe = zc.recipe.egg
-#python = python2.6
+python = python2.6
eggs = ${instance-recipe:egg}
+[eggs]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+ ${lxml-python:egg}
+
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
-#md5sum = 1b29b27aedcc7fa5f30f1053e8eab13f
+md5sum = 837caf9897332a5f70c72438f1dc5bae
output = ${buildout:directory}/template.cfg
mode = 0644
@@ -73,10 +80,13 @@ update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[versions]
# Required by:
# slapos.cookbook==0.1
-collective.recipe.template = 1.8
-slapos.slap = 1.2.dev-r4679
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
+#collective.recipe.template = 1.8
+#slapos.slap = 1.2.dev-r4679
+#netaddr = 0.7.5
+#xml-marshaller = 0.9.7
+
+#zc.buildout=1.5.3-dev-SlapOS-002
+#setuptools = 0.6c12dev-r88795
-zc.buildout=1.5.3-dev-SlapOS-002
-setuptools = 0.6c12dev-r88795
\ No newline at end of file
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001
\ No newline at end of file
--
2.30.9