Mysql : Removing git clone cookbook, setting versions, before integration to master

software/mariadb/software.cfg

 [buildout]
-slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
-develop =
-  ${:slaposcookbook_recipe_location}
-  
+
 extensions =
   slapos.zcbworkarounds
   slapos.rebootstrap
@@ -11,7 +8,6 @@ find-links +=
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/git/buildout.cfg
   ../../component/mariadb/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -59,11 +55,6 @@ egg = slapos.cookbook
 module = mysql
 
 [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}
@@ -82,21 +73,19 @@ md5sum = 69c32a67c5640d36ee042d2cfc35843d
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[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
-
 [versions]
-# Required by:
-# slapos.cookbook==0.1
+slapos.cookbook = 0.7
+
+# Required by slapos.cookbook==0.7
+slapos.core = 0.3
 collective.recipe.template = 1.8
 netaddr = 0.7.5
 xml-marshaller = 0.9.7
-
-zc.buildout=1.5.3-dev-SlapOS-001
 setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/mysql-5.1/software.cfg

 [buildout]
-slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
-develop =
-  ${:slaposcookbook_recipe_location}
 
 extensions =
   slapos.zcbworkarounds
@@ -11,7 +8,6 @@ find-links +=
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/git/buildout.cfg
   ../../component/mysql-5.1/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -60,11 +56,6 @@ egg = slapos.cookbook
 module = mysql
 
 [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}
@@ -83,21 +74,19 @@ md5sum = 2764597a6e4fe243cdf6e37b6535e767
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[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
-
 [versions]
-# Required by:
-# slapos.cookbook==0.1
+slapos.cookbook = 0.7
+
+# Required by slapos.cookbook==0.7
+slapos.core = 0.3
 collective.recipe.template = 1.8
 netaddr = 0.7.5
 xml-marshaller = 0.9.7
-
-zc.buildout=1.5.3-dev-SlapOS-001
 setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001