Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel

[build.git] / onelab-k32-tags.mk

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 6fd8d64..61f15cd 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -4,8 +4,8 @@
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-27
 # help out spec2make on f8 and centos5, due to a bug in rpm 
-# ditto on f15 for spec2make.py - tmp hopefully
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f15 centos5)"
+# ditto on f16 for spec2make.py - tmp hopefully
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
@@ -49,10 +49,10 @@ ejabberd-GITPATH            := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-2
-sface-GITPATH                   := git://git.onelab.eu/sface.git@master
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-4
+sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-0
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-11