take manifold + myslice out of lxc and into a distro of their own

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 3cab0fd..b0c1456 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -51,9 +51,5 @@ myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.3-
 #
 sfa-BRANCH                     := geni-v3
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
 #
 sfa-BRANCH                     := geni-v3
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2

-#sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
-#
-myslice-GITPATH                        := git://git.onelab.eu/myslice.git@onelab
-manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel

 #
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master
 #
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master

diff --git a/lxc.mk b/lxc.mk
index a6e86e7..d2c894d 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -492,33 +492,9 @@ release-RPMDATE := yes
 ALL += release
 
 ##############################
 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
 #
 # 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
-myslice-STOCK-DEVEL-RPMS := python-django
-myslice-STOCK-DEVEL-DEBS := python-django python-django-south
-#ALL += myslice
-
-manifold-MODULES := manifold
-manifold-SPEC := manifold.spec
-#ALL += manifold

diff --git a/myslice-tags.mk b/myslice-tags.mk
new file mode 100644 (file)
index 0000000..6763acf
--- /dev/null
+++ b/myslice-tags.mk
@@ -0,0 +1,2 @@
+myslice-GITPATH                        := git://git.onelab.eu/myslice.git@onelab
+manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel

diff --git a/myslice.mk b/myslice.mk
new file mode 100644 (file)
index 0000000..201b67f
--- /dev/null
+++ b/myslice.mk
@@ -0,0 +1,12 @@
+########## 
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+ALL += manifold
+
+myslice-MODULES := myslice
+myslice-SPEC := myslice.spec
+myslice-STOCK-DEVEL-RPMS := python-django
+myslice-STOCK-DEVEL-DEBS := python-django python-django-south
+myslice-LOCAL-DEVEL-RPMS := manifold
+ALL += myslice
+