reviewed trunk from 4.2

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 5115480..66aa5af 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -5,7 +5,6 @@ linux-2.6-SVNPATH               := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
-libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
@@ -20,6 +19,7 @@ Mom-SVNPATH                   := http://svn.planet-lab.org/svn/Mom/trunk
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
+dummynet_image-SVNPATH         := http://svn.planet-lab.org/svn/dummynet_image/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
 PLCWWW-SVNBRANCH               := onelab.5.0
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/branches/onelab.5.0

diff --git a/onelab.mk b/onelab.mk
index b96a12f..f74dbf6 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -208,6 +208,14 @@ IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
 
+#
+# dummynet_image
+# 
+dummynet_image-MODULES := dummynet_image
+dummynet_image-SPEC := dummynet_image.spec
+IN_MYPLC += dummynet_image
+ALL += dummynet_image
+
 #
 # PLCAPI
 #
@@ -232,6 +240,13 @@ Monitor-SPEC := Monitor.spec
 ALL += Monitor
 IN_BOOTSTRAPFS += Monitor
 
+#
+# monitor-server
+#
+monitor-server-MODULES := Monitor
+monitor-server-SPEC := monitor-server.spec
+ALL += monitor-server
+
 #
 # nodeconfig
 #

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index b1f4ae2..fced821 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -3,7 +3,6 @@
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
-libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk