From dac5977240628348781c88dd2b12dc9ae884cf19 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 1 Sep 2008 12:30:58 +0000 Subject: [PATCH] reviewed trunk from 4.2 --- onelab-tags.mk | 2 +- onelab.mk | 15 +++++++++++++++ planetlab-tags.mk | 1 - 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/onelab-tags.mk b/onelab-tags.mk index 5115480b..66aa5afb 100644 --- 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 b96a12fe..f74dbf68 100644 --- 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 b1f4ae22..fced821e 100644 --- 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 -- 2.43.0