merge from svn

diff --git a/Makefile b/Makefile
index fc2cf2a..aea676c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -405,7 +405,7 @@ endif
 ### this utility allows to extract various info from a spec file
 ### and to define them in makefiles
 spec2make: spec2make.c
-       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt 
+       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt
 
 ### run spec2make on the spec file and include the result
 # usage: spec2make package

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 9007ac6..0577d8e 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -40,7 +40,7 @@ pyaspects-SVNPATH             := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
 omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-4
 ###
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9

diff --git a/onelab-tags.mk b/onelab-tags.mk
index cd10264..f11d248 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -43,7 +43,7 @@ pyaspects-SVNPATH             := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
 omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-4
 ###
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9

diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk
index 8a885fe..7f15d5b 100644 (file)
--- a/planetbridge-tags.mk
+++ b/planetbridge-tags.mk
@@ -37,7 +37,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
 MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
 

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index c17d5fc..e665945 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -39,7 +39,7 @@ pyaspects-SVNPATH             := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
 omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-4
 ###
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index d532eba..66c38c6 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -40,7 +40,7 @@ pyaspects-SVNPATH             := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
 omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-4
 ###
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 4b9be65..41e57e1 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -37,7 +37,7 @@ pyaspects-SVNPATH             := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
 omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-4
 ###
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9

diff --git a/trellis-tags.mk b/trellis-tags.mk
index 7d63c07..e1c1742 100644 (file)
--- a/trellis-tags.mk
+++ b/trellis-tags.mk
@@ -42,7 +42,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
 MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-11
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-12
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                   := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10