From 9751d641c81c3b7ab76de3753731fb20d13a7929 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 4 Jun 2013 17:16:00 +0200 Subject: [PATCH] lxc distro now builds rvm-ruby as well, and shares sliceimage-omf with onelab (and pl) omf module is not used anymore --- config.lxc/sliceimage-omf.pkgs | 1 + config.onelab/sliceimage-omf.pkgs | 5 +---- config.planetlab/sliceimage-omf.pkgs | 4 ++++ lxc-tags.mk | 6 ++++-- lxc.mk | 19 ++++++++++--------- modules.list | 1 - onelab-tags.mk | 9 ++++----- 7 files changed, 24 insertions(+), 21 deletions(-) create mode 120000 config.lxc/sliceimage-omf.pkgs mode change 100644 => 120000 config.onelab/sliceimage-omf.pkgs create mode 100644 config.planetlab/sliceimage-omf.pkgs diff --git a/config.lxc/sliceimage-omf.pkgs b/config.lxc/sliceimage-omf.pkgs new file mode 120000 index 00000000..53d80a5f --- /dev/null +++ b/config.lxc/sliceimage-omf.pkgs @@ -0,0 +1 @@ +../config.planetlab/sliceimage-omf.pkgs \ No newline at end of file diff --git a/config.onelab/sliceimage-omf.pkgs b/config.onelab/sliceimage-omf.pkgs deleted file mode 100644 index 4dd4f7e5..00000000 --- a/config.onelab/sliceimage-omf.pkgs +++ /dev/null @@ -1,4 +0,0 @@ -# -groupname: rvm-ruby -groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem -package: rvm-ruby diff --git a/config.onelab/sliceimage-omf.pkgs b/config.onelab/sliceimage-omf.pkgs new file mode 120000 index 00000000..53d80a5f --- /dev/null +++ b/config.onelab/sliceimage-omf.pkgs @@ -0,0 +1 @@ +../config.planetlab/sliceimage-omf.pkgs \ No newline at end of file diff --git a/config.planetlab/sliceimage-omf.pkgs b/config.planetlab/sliceimage-omf.pkgs new file mode 100644 index 00000000..4dd4f7e5 --- /dev/null +++ b/config.planetlab/sliceimage-omf.pkgs @@ -0,0 +1,4 @@ +# +groupname: rvm-ruby +groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem +package: rvm-ruby diff --git a/lxc-tags.mk b/lxc-tags.mk index 008fb9bb..8877abb1 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -30,15 +30,17 @@ www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard monitor-GITPATH := git://git.planet-lab.org/monitor@monitor-3.1-6 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2 -### pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3 -omf-GITPATH := git://git.planet-lab.org/omf.git@omf-5.3-11 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-2 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1 pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11 pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16 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-GITPATH := git://git.onelab.eu/rvm-rpm.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-2 sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-4 nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-1 diff --git a/lxc.mk b/lxc.mk index c16c3cd2..6d0f3caa 100644 --- a/lxc.mk +++ b/lxc.mk @@ -379,19 +379,20 @@ IN_MYPLC += pyplnet IN_BOOTCD += pyplnet # -# OMF resource controller +# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff # -omf-resctl-MODULES := omf -omf-resctl-SPEC := omf-resctl.spec -ALL += omf-resctl -IN_SLICEIMAGE += omf-resctl +rvm-ruby-MODULES := rvm-ruby +rvm-ruby-SPEC := rpm/rvm-ruby.spec +rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel +ALL += rvm-ruby # -# OMF exp controller +# OML measurement library # -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl +oml-MODULES := oml +oml-DEVEL-RPMS += sqlite-devel +oml-SPEC := liboml.spec +ALL += oml # # bootcd diff --git a/modules.list b/modules.list index bc3ba532..b3bca7ad 100644 --- a/modules.list +++ b/modules.list @@ -20,7 +20,6 @@ nodeconfig nodeimage nodemanager nodeupdate -omf rvm-ruby oml pcucontrol diff --git a/onelab-tags.mk b/onelab-tags.mk index 76448064..f3afd52d 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -41,16 +41,15 @@ pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol monitor-GITPATH := git://git.onelab.eu/monitor.git@monitor-3.1-6 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2 -### pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-3 -### -rvm-ruby-GITPATH := git://git.onelab.eu/rvm-rpm.git@planetlab -oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 -### nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-2 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-1 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-16 +### +rvm-ruby-GITPATH := git://git.onelab.eu/rvm-rpm.git@planetlab +oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 +### bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-2 sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-4 nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-1 -- 2.43.0