From 7d972ded927761d2b69b1ca9c133036d1c60666b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Wed, 1 Jun 2011 20:09:55 +0200
Subject: [PATCH] KumoFS software release : update software.cfg, using mysql as
model
---
software/kumofs/software.cfg | 58 +++++++++++++++++++++++++-----------
1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/software/kumofs/software.cfg b/software/kumofs/software.cfg
index 8a7a2f294..ddd6aee19 100644
--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
@@ -1,8 +1,12 @@
[buildout]
+slaposcookbook_location = ${:parts-directory}/slaposcookbook
+
+develop = ${:slaposcookbook_location}
+
extensions =
- slapos.rebootstrap
slapos.tool.networkcache
slapos.zcbworkarounds
+#slapos.rebootstrap
find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/
@@ -15,6 +19,7 @@ versions = versions
parts +=
# Create instance template
template
+ instance-recipe-egg
# XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -27,11 +32,39 @@ unzip = true
egg = slapos.cookbook
module = kumofs
+#[rebootstrap]
+# Default first version of rebootstrapped python
+#version = 2
+#section = python2.7
+
+[slaposcookbook]
+recipe = plone.recipe.command
+git_param =--quiet -b mysql
+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
+
+[instance-recipe]
+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}
+
[template]
-# Default template for erp5 instance.
-recipe = slapos.cookbook:template
+# Default template for the instance.
+recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
-md5sum = 1b29b27aedcc7fa5f30f1053e8eab13f
+#md5sum = 1b29b27aedcc7fa5f30f1053e8eab13f
output = ${buildout:directory}/template.cfg
mode = 0644
@@ -39,18 +72,9 @@ mode = 0644
# Required by:
# slapos.cookbook==0.1
collective.recipe.template = 1.8
-
-# Required by:
-# slapos.cookbook==0.1
-netaddr = 0.7.5
-
-zc.buildout==1.5.3-dev-SlapOS-001
-setuptools = 0.6c12dev-r88795
-
-# Required by:
-# slapos.cookbook==0.1
slapos.slap = 1.2.dev-r4679
-
-# Required by:
-# slapos.cookbook==0.1
+netaddr = 0.7.5
xml-marshaller = 0.9.7
+
+zc.buildout=1.5.3-dev-SlapOS-002
+setuptools = 0.6c12dev-r88795
\ No newline at end of file
--
2.30.9