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)
# usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
function pl_getPackages() { pl_parsePkgs package "$@" ; }
function pl_getGroups() { pl_parsePkgs group "$@" ; }
# 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 "$@" ; }
##############################
##############################
-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
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
###
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
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
IN_MYPLC += pyplnet
IN_BOOTCD += 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
#
#
# OML measurement library
#
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
###
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
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
IN_MYPLC += pyplnet
IN_BOOTCD += 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
#
#
# OML measurement library
#