From: Thierry Parmentelat Date: Tue, 15 Apr 2014 11:24:01 +0000 (+0200) Subject: we do not need rvm-ruby on f>=18 X-Git-Tag: 5.3.5~17 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=8bb93331419a8cbac3850d205f9939bfd6f5a26f we do not need rvm-ruby on f>=18 the fedora-provided ruby on these systems is fine for OMF rc rvm-ruby would not build any longer anyway take advantage of sliceimage being able to install pips and gems (omf_rc is a gem) --- diff --git a/build.common b/build.common index 51cb0d0f..b248986c 100644 --- a/build.common +++ b/build.common @@ -573,6 +573,8 @@ function pl_parsePkgs () { # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s] function pl_getPackages() { pl_parsePkgs package "$@" ; } function pl_getGroups() { pl_parsePkgs group "$@" ; } +function pl_getPips() { pl_parsePkgs pip "$@" ; } +function pl_getGems() { pl_parsePkgs gem "$@" ; } ############################## 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 diff --git a/lxc-tags.mk b/lxc-tags.mk index 8326acf3..749ba47c 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -39,8 +39,7 @@ pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet- DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 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 +# omf-resctl now comes from yum and gem, no need for rvm-ruby anymore 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..cc3dfa5c 100644 --- a/lxc.mk +++ b/lxc.mk @@ -369,18 +369,6 @@ IN_NODEIMAGE += pyplnet IN_MYPLC += pyplnet 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 # diff --git a/nornet-tags.mk b/nornet-tags.mk index dcdb0d54..a8cb2028 100644 --- a/nornet-tags.mk +++ b/nornet-tags.mk @@ -71,8 +71,6 @@ pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet- DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 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 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/nornet.mk b/nornet.mk index fa8261fc..b2e5f371 100644 --- a/nornet.mk +++ b/nornet.mk @@ -486,18 +486,6 @@ IN_NODEIMAGE += pyplnet IN_MYPLC += pyplnet 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 #