From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 2 Oct 2008 15:27:01 +0000 (+0000)
Subject: shoving umts tools from napoli in 4.2/onelab
X-Git-Tag: 4.2-rc23~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a756194772a00f1f9bba542efd5eda4f9ccb2cf8;p=build.git

shoving umts tools from napoli in 4.2/onelab
---

diff --git a/config.onelab/bootstrapfs-umts.pkgs b/config.onelab/bootstrapfs-umts.pkgs
index 477ea9e4..18d793ff 100644
--- a/config.onelab/bootstrapfs-umts.pkgs
+++ b/config.onelab/bootstrapfs-umts.pkgs
@@ -4,3 +4,4 @@ groupdesc: planetlab node umts extensions
 package: nozomi
 package: comgt
 package: wvdial
+package: planetlab-umts-tools-backend
diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index f266224b..f65fc45d 100644
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -6,8 +6,10 @@
 
 linux-2.6-SVNPATH		:= http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-28
 madwifi-SVNPATH			:= http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
-nozomi-SVNPATH			:= http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
-comgt-SVNPATH			:= http://svn.one-lab.org/comgt/imports/0.3
+nozomi-SVNPATH			:= http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
+comgt-SVNPATH			:= http://svn.onelab.eu/comgt/imports/0.3
+umts-tools-SVNPATH		:= http://svn.onelab.eu/planetlab-umts-tools/trunk
+umts-tools-backend-SVNPATH	:= http://svn.onelab.eu/planetlab-umts-tools-backend/trunk
 util-vserver-SVNBRANCH		:= scholz
 util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4
 util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-14
diff --git a/onelab.mk b/onelab.mk
index 999dfb26..2a41cca5 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -84,6 +84,22 @@ comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
+#
+# umts: slice tools
+#
+umts-tools-MODULES := umts-tools
+umts-tools-SPEC := umtstools.spec
+IN_VSERVER += umts-tools
+ALL += umts-tools
+
+#
+# umts: root context stuff
+#
+umts-tools-backend-MODULES := umts-tools-backend
+umts-tools-backend-SPEC := umtstools-backend.spec
+IN_BOOTSTRAPFS += umts-tools-backend
+ALL += umts-tools-backend
+
 #
 # util-vserver
 #