try to reenable monitor/zabbix/plcrt..

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 66423e3..e12a5b6 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -37,12 +37,12 @@ PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/trunk
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-40
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-0
+Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-13
 pypcilib-SVNPATH                := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
-BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-16
+BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/trunk
 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/trunk

diff --git a/onelab-tags.mk b/onelab-tags.mk
index f0a3483..865dea5 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -37,12 +37,12 @@ PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/trunk
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-40
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-0
+Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-13
 pypcilib-SVNPATH                := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
-BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-16
+BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/trunk
 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/trunk

diff --git a/onelab.mk b/onelab.mk
index f5f47b1..92f3aa8 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -325,14 +325,14 @@ ALL += pcucontrol
 monitor-MODULES := Monitor
 monitor-SPEC := Monitor.spec
 ALL += monitor
-###xxx-tmp-off IN_BOOTSTRAPFS += monitor
+IN_BOOTSTRAPFS += monitor
 
 #
 # PLC RT
 #
 plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
-###xxx-tmp-off ALL += plcrt
+ALL += plcrt
 
 #
 # zabbix
@@ -340,7 +340,7 @@ plcrt-SPEC := plcrt.spec
 zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
-###xxx-tmp-off ALL += zabbix
+ALL += zabbix
 
 #
 # pyopenssl