From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 27 Mar 2014 10:33:26 +0000 (+0100)
Subject: 1. do create an omf sliceimage, even if it might have no real addition, so that omf... 
X-Git-Tag: 5.3.3~4
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=0d351d3fdddbcfe2e47021c26043419f6da4e7b4

1. do create an omf sliceimage, even if it might have no real addition, so that omf-friendly slices at least take off
2. turn on rvm-ruby building on f20 - might it work now ?
---

diff --git a/config.lxc/sliceimage-omf.pkgs.hide b/config.lxc/sliceimage-omf.pkgs
similarity index 100%
rename from config.lxc/sliceimage-omf.pkgs.hide
rename to config.lxc/sliceimage-omf.pkgs
diff --git a/config.planetlab/sliceimage-omf.pkgs b/config.planetlab/sliceimage-omf.pkgs
index 4dd4f7e5..f597a07a 100644
--- a/config.planetlab/sliceimage-omf.pkgs
+++ b/config.planetlab/sliceimage-omf.pkgs
@@ -1,4 +1,8 @@
 #
 groupname: rvm-ruby
 groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem
-package: rvm-ruby
+# 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>=f18: rvm-ruby
diff --git a/lxc.mk b/lxc.mk
index 80ebec2f..e4c3b19b 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -372,12 +372,14 @@ IN_BOOTCD += pyplnet
 #
 # for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
 #
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18)"
 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