drop older omf-resctl (and expctl in the same shot) and install rvm-ruby instead

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index d76ac81..4ccb77b 100644 (file)
--- 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