X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=71366590e643a946e5c76b0a81d93480af90b250;hb=9d0f352a3163a897f3f9bc55c22a766d250eb6a0;hp=ef21d8abada9ab4fe5fa803bd3ea4f927078face;hpb=457beb5d81340c835c116a1ed3fcc0dc9819e466;p=build.git

diff --git a/lxc.mk b/lxc.mk
index ef21d8ab..71366590 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -8,23 +8,15 @@
 # see doc in Makefile  
 #
 
-### the madwifi drivers ahip with fedora16's kernel rpm
+### the madwifi drivers ship with fedora16's kernel rpm
 
 #
-# lxctools: scripts for entering containers
+# lxc-userspace: scripts for entering containers
 #
-lxctools-MODULES := lxctools
-lxctools-SPEC := lxctools.spec
-ALL += lxctools
-IN_NODEIMAGE += lxctools
-
-#
-# lxcsu: root context module for entering namespaces
-#
-lxcsu-MODULES := lxcsu
-lxcsu-SPEC := lxcsu.spec
-ALL += lxcsu
-IN_NODEIMAGE += lxcsu
+lxc-userspace-MODULES := lxc-userspace
+lxc-userspace-SPEC := lxc-userspace.spec
+ALL += lxc-userspace
+IN_NODEIMAGE += lxc-userspace
 
 #
 #
@@ -271,6 +263,7 @@ ifeq "$(DISTRO)" "Fedora"
 ifneq "$(DISTRONAME)" "f16"
 mod_python-MODULES := mod_python
 mod_python-SPEC	:= mod_python.spec
+mod_python-DEVEL-RPMS := httpd-devel
 mod_python-BUILD-FROM-SRPM := yes
 ALL += mod_python
 endif
@@ -378,19 +371,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