add umts tools in the lxc mix

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index b63ec5f..ddede07 100644 (file)
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -118,6 +118,9 @@ package: monitor-client
 package: monitor-runlevelagent
 package: net-tools
 
+### used to be in the onelab umts extension, but doesn't hurt anyone
+package: planetlab-umts-tools-backend ppp comgt
+
 ### convenience
 package: less
 package: emacs-nox

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 1173d43..e2ba4bd 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -4,6 +4,8 @@ lxc-userspace-GITPATH           := git://git.planet-lab.org/lxc-userspace.git@ma
 transforward-GITPATH           := git://git.planet-lab.org/transforward.git@transforward-0.1-3
 procprotect-GITPATH             := git://git.planet-lab.org/procprotect.git@procprotect-0.3-4
 ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@ipfw-20130423-1
+comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
+planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@master
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-10
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2

diff --git a/lxc.mk b/lxc.mk
index 200a707..17901b1 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -50,6 +50,30 @@ ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
 #endif
 
+#
+# comgt - a companion to umts tools
+# 
+comgt-MODULES := comgt
+comgt-SPEC := comgt.spec
+IN_NODEIMAGE += comgt
+ALL += comgt
+
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_NODEIMAGE += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_SLICEIMAGE += umts-frontend
+ALL += umts-frontend
+
 #
 # NodeUpdate
 #