more fixes

diff --git a/wexlxc-tags.mk b/wexlxc-tags.mk
index 62c6912..bd51d4d 100644 (file)
--- a/wexlxc-tags.mk
+++ b/wexlxc-tags.mk
@@ -8,6 +8,10 @@ spectools-GITPATH              := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
 #sge-GITPATH                   := git://git.onelab.eu/sge/tags/sge-6.2.3-1
 #sge-GITPATH                   := git://git.onelab.eu/sge/trunk
 
+lxcsu-GITPATH                  := git://git.planet-lab.org/lxcsu.git@lxcsu-0.2-1
+lxctools-GITPATH               := git://git.planet-lab.org/lxctools.git@lxctools-0.9-1
+transforward-GITPATH           := git://git.planet-lab.org/transforward.git@transforward-0.1-2
+procprotect-GITPATH             := git://git.planet-lab.org/procprotect.git@procprotect-0.1-3
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-2
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1

diff --git a/wexlxc.mk b/wexlxc.mk
index b07dd4d..3585169 100644 (file)
--- a/wexlxc.mk
+++ b/wexlxc.mk
@@ -340,13 +340,6 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
-#
-# pcucontrol
-#
-pcucontrol-MODULES := pcucontrol
-pcucontrol-SPEC := pcucontrol.spec
-ALL += pcucontrol
-
 #
 # pyaspects
 #
@@ -355,26 +348,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
-endif
-
 #
 # nodeconfig
 #