add pcucontrol. build monitor and myplc from trunk

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 9a4fb78..6d848d1 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -38,13 +38,14 @@ 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/trunk
+pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/trunk
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/trunk
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-13
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/trunk
 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-10
-MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-33
+MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/trunk
 sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/trunk
 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-11

diff --git a/onelab.mk b/onelab.mk
index 5c91f8e..3659577 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -312,12 +312,19 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
+
 #
 # monitor
 #
 monitor-MODULES := Monitor
 monitor-SPEC := Monitor.spec
-###xxx-tmp-off ALL += monitor
+ALL += monitor
 ###xxx-tmp-off IN_BOOTSTRAPFS += monitor
 
 #