rename the myslice distribution as 'federation' and pour sfa in the mix

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 80ebec2..d2c894d 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -370,14 +370,16 @@ IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
-# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
+# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
 #
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
 # Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
 # turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
-#ALL += rvm-ruby
+ALL += rvm-ruby
+endif
 
 #
 # OML measurement library
@@ -490,33 +492,9 @@ 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
-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