lxc distro now builds rvm-ruby as well, and shares sliceimage-omf with onelab (and pl)

omf module is not used anymore

diff --git a/config.lxc/sliceimage-omf.pkgs b/config.lxc/sliceimage-omf.pkgs
new file mode 120000 (symlink)
index 0000000..53d80a5
--- /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 (file)
index 4dd4f7e50342dcc15f00a832e88a735302b79d09..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..53d80a5f7e07ffd102db25cfdb3da8ead4a21cd9
--- /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 (file)
index 0000000..4dd4f7e
--- /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 008fb9b..8877abb 100644 (file)
--- 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 c16c3cd..6d0f3ca 100644 (file)
--- 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 bc3ba53..b3bca7a 100644 (file)
--- 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 7644806..f3afd52 100644 (file)
--- 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