X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=4ccb77be7382e789c69bc571aa17bc71c7626a98;hb=4953630cabc98fbed061cab94bca0b4d0c6f064d;hp=6b8ab5d2e3c233592195eb344b2cfa24271d2648;hpb=1e912acfd2bf1df227122d2e6f9dd404ea8d53ff;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 6b8ab5d2..4ccb77be 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -322,6 +322,9 @@ autoconf-BUILD-FROM-SRPM := yes
 ALL += autoconf
 endif
 
+#
+# sliver-openvswitch
+#
 sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 ifeq "$(DISTRONAME)" "f12"
@@ -440,19 +443,12 @@ IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_SLICEIMAGE += omf-resctl
-
-#
-# OMF exp controller
+# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
 #
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
+rvm-ruby-MODULES := rvm-ruby
+rvm-ruby-SPEC := rpm/rvm-ruby.spec
+rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel
+ALL += rvm-ruby
 
 #
 # OML measurement library
@@ -565,8 +561,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
@@ -586,11 +581,11 @@ ALL += sface
 endif
 
 ##############################
+# don't build these by default, we have separate builds for that
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
-ALL += myslice
+#ALL += myslice
 
 manifold-MODULES := manifold
 manifold-SPEC := manifold.spec
-# not yet though
 #ALL += manifold