Merge commit 'origin/master'

diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk
index c52be30..18f8636 100644 (file)
--- a/onelab-k22-tags.mk
+++ b/onelab-k22-tags.mk
@@ -33,7 +33,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-62
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-63
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -45,7 +45,7 @@ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-21
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-9
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
@@ -58,4 +58,4 @@ myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-17
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-26
+tests-GITPATH                   := git://git.onelab.eu/tests.git@master

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 191ccd3..e4b0651 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -32,7 +32,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-62
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-63
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -44,7 +44,7 @@ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-21
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-9
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
@@ -57,7 +57,7 @@ myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-17
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-26
+tests-GITPATH                   := git://git.onelab.eu/tests.git@master
 
 ### temporary
 # nozomi not needed anymore for 2.6.27

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 352070e..171caf0 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -38,7 +38,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-62
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-63
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -63,7 +63,7 @@ myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-17
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-26
+tests-GITPATH                   := git://git.onelab.eu/tests.git@master
 
 ### temporary
 # nozomi not needed anymore for 2.6.27

diff --git a/partial-repo.sh b/partial-repo.sh
new file mode 100755 (executable)
index 0000000..09771c0
--- /dev/null
+++ b/partial-repo.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# $URL$
+
+COMMAND=$(basename $0)
+
+function usage () {
+    echo "Usage: $COMMAND repo1..."
+    echo "  a 'RPMS' subdir is expected in each repo arg"
+    exit 1
+}
+
+[[ -n "$@" ]] || usage
+
+set -e 
+
+for repo in "$@" ; do
+    if [ ! -d $repo/RPMS ] ; then
+       echo could not find $repo/RPMS - ignored
+       continue
+    fi
+
+    cd $repo
+    echo "==================== Dealing with repo $repo"
+    mkdir -p PARTIAL-RPMS
+    rsync --archive --verbose $(find RPMS -type f | egrep '/(bootcd|bootstrapfs|noderepo)-.*-.*-.*-.*rpm') PARTIAL-RPMS/
+    echo "==================== building packages index in $repo .."
+    createrepo PARTIAL-RPMS
+    echo '==================== DONE'
+    cd - >& /dev/null
+done

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 8517f8a..97ffa83 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -28,7 +28,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-62
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-63
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 6e66027..a7fd87e 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -35,7 +35,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-62
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-63
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 30db899..4a5f9f1 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -27,7 +27,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-32
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-62
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-63
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35

diff --git a/trellis-tags.mk b/trellis-tags.mk
index e0743fe..8346d0a 100644 (file)
--- a/trellis-tags.mk
+++ b/trellis-tags.mk
@@ -31,7 +31,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys@vsys-0.9-4
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-24
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-62
+PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-63
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4/