declare myslice and manifold in lxc for more consistency

align onelab and lxc for a few cosmetic details

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 5df72d9..08dbf3b 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -32,9 +32,6 @@ pyopenssl-GITPATH               := git://git.planet-lab.org/pyopenssl.git@pyopen
 ###
 pyaspects-GITPATH               := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3
 omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-11
-###
-sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
-sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 nodeconfig-GITPATH              := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-2
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1
 pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
@@ -45,5 +42,12 @@ bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.
 sliceimage-GITPATH              := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3
 nodeimage-GITPATH               := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-1
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.2-3
+
+#
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
+sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
+#
+myslice-GITPATH                        := git://git.onelab.eu/myslice.git@master
+manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.2-3

diff --git a/lxc.mk b/lxc.mk
index 0e11b4f..6d9db04 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -324,26 +324,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
 #
@@ -494,3 +474,33 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
+
+##############################
+# sfa requires python-2.7
+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
+
+##############################
+# don't build these by default, we have separate builds for that
+myslice-MODULES := myslice
+myslice-SPEC := myslice.spec
+#ALL += myslice
+
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+#ALL += manifold

diff --git a/onelab.mk b/onelab.mk
index 5ea3fff..d76ac81 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -565,8 +565,7 @@ release-RPMDATE := yes
 ALL += release
 
 ##############################
-# 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
+# sfa requires python-2.7
 build_sfa=true
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
 build_sfa=false