From: Thierry Parmentelat Date: Wed, 9 Apr 2014 06:34:05 +0000 (+0200) Subject: turn rvm-ruby back on for forensics X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=f379256b122462264dc0a46cb341888db726d001 turn rvm-ruby back on for forensics --- diff --git a/lxc-tags.mk b/lxc-tags.mk index 8326acf3..62e0c258 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -40,7 +40,7 @@ DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRate pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-13 ### rvm-ruby-BRANCH := planetlab -rvm-ruby-GITPATH := git://git.onelab.eu/rvm-ruby.git@rvm-ruby-1.22.9-1 +rvm-ruby-GITPATH := git://git.onelab.eu/rvm-ruby.git@planetlab oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-4 diff --git a/lxc.mk b/lxc.mk index d2c894df..6855416f 100644 --- a/lxc.mk +++ b/lxc.mk @@ -372,14 +372,12 @@ 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 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 -endif # # OML measurement library