Merge branch 'master' into lxc_devel

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

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 11c2c36..957e5de 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -3,9 +3,10 @@
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
+linux-3-GITPATH                := git://git.planet-lab.org/linux-3.git@lxcbuild
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
+kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers,kernel-firmware
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-4
@@ -44,8 +45,8 @@ pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
-sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-4
-sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-0
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
+sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-3
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10