Merge remote-tracking branch 'origin/kvm' into kvm

dfd766cf · Romain Courteaud · 8da8de51 · 9a92cc2b · dfd766cf
Commit dfd766cf authored Jan 09, 2012 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

software/kvm/software.cfg software/kvm/software.cfg +2 -7

No files found.
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -11,7 +11,6 @@ extends =
  ../../component/lxml-python/buildout.cfg
  ../../component/noVNC/buildout.cfg
  ../../component/openssl/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
  ../../component/rdiff-backup/buildout.cfg
  ../../stack/shacache-client.cfg
@@ -62,11 +61,8 @@ allow-hosts =
 [kvm]
 recipe = hexagonit.recipe.cmmi
-url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/0.15.1/qemu-kvm-0.15.1.tar.gz
+url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.0/qemu-kvm-1.0.tar.gz
-# XXX-Cedric : Upgrade to 1.0
+md5sum = 00a825db46a70ba8ef9fc95da9cc7c1e
-# url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.0/qemu-kvm-1.0.tar.gz
-# md5sum = 00a825db46a70ba8ef9fc95da9cc7c1e
-md5sum = 8800a7d6b3aa4a168ea7f78dc66c0320
 configure-options =
  --disable-sdl
  --disable-xen
@@ -104,7 +100,6 @@ command = grep parts ${buildout:develop-eggs-directory}/websockify.egg-link
 depends = ${eggs:dummy}
 [eggs]
-python = python2.7
 recipe = z3c.recipe.scripts
 dummy =
  ${websockify:location}