Changes to instance, software and kvm buildout profiles

software/kvm/instance.cfg

@@ -6,11 +6,13 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory} 
 
 [kvminstance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
+recipe = slapos.recipe.kvm
 qemu_path = ${kvm:location}/bin/qemu-system-x86_64
 qemu_img_path = ${kvm:location}/bin/qemu-img
 slapmonitor_path = ${buildout:bin-directory}/slapmonitor
 slapreport_path = ${buildout:bin-directory}/slapreport
+websockify_path = ${buildout:parts-directory}/websockify/websockify
+noVNC_location = ${buildout:parts-directory}/noVNC/
 
 smp_count = 1
 ram_size = 1024

software/kvm/software.cfg

 [buildout]
-extends =
-  ../../stack/kvm.cfg
 
+slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
+
+develop =
+  ${:slaposcookbook_recipe_location}
 
-versions = versions
+extends =
+  ../../stack/kvm.cfg
 
 parts +=
   template
-  instance-recipe-egg
+
+[instance-recipe-egg]
+slaposcookbook_dummy = ${slaposcookbook:location}
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = cea53c71db313471620155e1105ebee3
+#md5sum = 6dd35876f5877fcab99f8d910058e076
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[instance-recipe]
-egg = slapos.cookbook
-module = kvm
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
-
-[versions]
-slapos.cookbook = 0.10
+[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
\ No newline at end of file

stack/kvm.cfg

@@ -7,9 +7,10 @@ extends =
   ../component/readline/buildout.cfg
   ../component/ncurses/buildout.cfg
   ../component/libuuid/buildout.cfg
+  ../component/noVNC/buildout.cfg
 
 extensions =
-  slapos.tool.rebootstrap
+  slapos.rebootstrap
 
 parts =
   gnutls
@@ -27,8 +28,8 @@ version = 1
 
 [gpg-error]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.9.tar.gz
-md5sum = 6dde8fd075aef8eaf8d3ae414447bb35
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
+#md5sum = 6dde8fd075aef8eaf8d3ae414447bb35
 
 [gcrypt]
 recipe = hexagonit.recipe.cmmi
@@ -38,7 +39,7 @@ configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
   CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib
+  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
   
 [gnutls]
 recipe = hexagonit.recipe.cmmi
@@ -48,7 +49,7 @@ configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
-  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib
+  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
   PKG_CONFIG=${zlib:location}/lib/pkgconfig
 
 [kvm]
@@ -75,12 +76,11 @@ environment =
 recipe=plone.recipe.command
 location = ${buildout:parts-directory}/${:_buildout_section_name_} 
 stop-on-error = true
-tag = slapos-v0.1
+#tag = slapos-v0.1
 command =
-  (${git:location}/bin/git clone --quiet --branch ipv6 git://gitorious.org/slapos/slapos-kvm.git ${:location} &&
-  cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}) || (rm -fr ${:location} ; exit 1)
-update-command =
-  cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}
+  (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
+#update-command =
+# cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}
 
 [eggs]
 recipe = zc.recipe.egg