X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fsliceimage-omf.pkgs;h=0c36834629905641c605577a49063f5c60f93eb5;hb=8bb93331419a8cbac3850d205f9939bfd6f5a26f;hp=f7cc2af67c21e74e29dfef03c1dfabf19038ca66;hpb=9f2b8b8c30baf3ec7e65ae04beae1339d09ffcf1;p=build.git

diff --git a/config.planetlab/sliceimage-omf.pkgs b/config.planetlab/sliceimage-omf.pkgs
index f7cc2af6..0c368346 100644
--- a/config.planetlab/sliceimage-omf.pkgs
+++ b/config.planetlab/sliceimage-omf.pkgs
@@ -1,8 +1,14 @@
 #
-groupname: rvm-ruby
-groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem
-# unfortunately the rvm-ruby build got broken on f18 at some point because of 
-# changes in openssl - see lxc.mk
-# however it's best to define a valid extension here because otherwise
-# the omf sliceimage is not known, and slices cannot be instantiated
-package>=f22: rvm-ruby
+groupname: omf-resctl
+groupdesc: OMF resource controller
+
+# for versions up to f14, the mainstream version of ruby is too old
+# we use the rvm-ruby package, that relies on rvm to install the right ruby
+# plus the omf_resctl gem
+package<=f14: rvm-ruby
+
+# starting with f18 the mainstream versions of ruby is fine for omf resctl
+package>=f18: ruby ruby-devel
+gem>=f18: omf_rc
+
+package: oml