shoving umts tools from napoli in 4.2/onelab

diff --git a/config.onelab/bootstrapfs-umts.pkgs b/config.onelab/bootstrapfs-umts.pkgs
index 477ea9e..18d793f 100644 (file)
--- 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 f266224..f65fc45 100644 (file)
--- 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 999dfb2..2a41cca 100644 (file)
--- 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
 #