Merge branch 'master' into lxc_devel

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 81dc8b7..75f8472 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -49,8 +49,8 @@ ejabberd-GITPATH                := git://git.onelab.eu/ejabberd.git@master
 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-6
-sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-0
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-9
+sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-3
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10

diff --git a/onelab.mk b/onelab.mk
index 7ac07d4..109fb73 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -211,10 +211,13 @@ IN_BOOTSTRAPFS += fprobe-ulog
 #
 # DistributedRateLimiting
 #
+# on f16 somehow configure screws up and defines LDFLAGS=-Wl,-z,relro which ld does not like..
+ifneq "$(DISTRONAME)" "f16"
 DistributedRateLimiting-MODULES := DistributedRateLimiting
 DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
 ALL += DistributedRateLimiting
 IN_NODEREPO += DistributedRateLimiting
+endif
 
 #
 # pf2slice

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index db3919f..024b34e 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -35,7 +35,7 @@ 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-6
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 747c1e1..957e5de 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -45,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-6
-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