From 8e2a63250c0b17da83ca84e64ecf4af012e9f7b0 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 3 Oct 2008 11:39:03 +0000
Subject: [PATCH] new layout for umts tools : 1 module, 2 packages

---
 onelab-tags-4.2.mk |  3 +--
 onelab.mk          | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index e360923c..8cd267b4 100644
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -8,8 +8,7 @@ linux-2.6-SVNPATH		:= http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-
 madwifi-SVNPATH                 := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-2
 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/tags/planetlab-umts-tools-0.4-1
-umts-tools-backend-SVNPATH	:= http://svn.onelab.eu/planetlab-umts-tools-backend/tags/planetlab-umts-tools-backend-0.4-1
+planetlab-umts-tools-SVNPATH	:= http://svn.onelab.eu/planetlab-umts-tools/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 2a41cca5..3001b041 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -85,20 +85,20 @@ IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
 #
-# umts: slice tools
+# umts: root context stuff
 #
-umts-tools-MODULES := umts-tools
-umts-tools-SPEC := umtstools.spec
-IN_VSERVER += umts-tools
-ALL += umts-tools
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend/backend.spec
+IN_BOOTSTRAPFS += umts-backend
+ALL += umts-backend
 
 #
-# umts: root context stuff
+# umts: slice tools
 #
-umts-tools-backend-MODULES := umts-tools-backend
-umts-tools-backend-SPEC := umtstools-backend.spec
-IN_BOOTSTRAPFS += umts-tools-backend
-ALL += umts-tools-backend
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend/frontend.spec
+IN_VSERVER += umts-frontend
+ALL += umts-frontend
 
 #
 # util-vserver
-- 
2.47.0