handle separate libvirt-python 1.2.1

[build.git] / lxc-tags.mk

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 12adf2e..bcd38cf 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -4,15 +4,22 @@ procprotect-GITPATH             := git://git.planet-lab.org/procprotect.git@mast
 ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@ipfw-20130423-1
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
-nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-10
+nodeupdate-GITPATH              := git://git.planet-lab.org/nodeupdate.git@master
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-5.2-9
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@master
 #
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.planet-lab.org/codemux.git@codemux-0.1-15
 fprobe-ulog-GITPATH             := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-3
+# tmp - hopefully we can get to use the same version on both 
+ifeq "$(DISTRONAME)" "f18"
+# this is a tag
 libvirt-GITPATH                 := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3
+# this is an ongoing branch
+else
+libvirt-GITPATH                        := git://git.onelab.eu/libvirt.git@1.2.1
+endif
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 mom-GITPATH                     := git://git.planet-lab.org/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2
@@ -42,12 +49,12 @@ oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 ###
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.2-3
 sliceimage-GITPATH              := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-6
-nodeimage-GITPATH               := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-2
+nodeimage-GITPATH               := git://git.planet-lab.org/nodeimage.git@master
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@master
 
 #
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-1
-sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
+#sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 #
 myslice-GITPATH                        := git://git.onelab.eu/myslice.git@master
 manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel