rename lxctools into lxc-userspace

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 6d9db04..7136659 100644 (file)
--- 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
 
 #
 #
@@ -244,6 +236,9 @@ bind_public-SPEC := bind_public.spec
 IN_SLICEIMAGE += bind_public
 ALL += bind_public
 
+#
+# sliver-openvswitch
+#
 sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 IN_SLICEIMAGE += sliver-openvswitch
@@ -257,6 +252,23 @@ plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi
 
+#
+# mod_python
+# 
+# this was dropped in fedora18, at which point the intention has been to
+# move to wsgi instead; however our using wsgi currently looks unstable
+# so you have the option to install this manually, in which case myplc will 
+# swap to using mod_python - see plc.d/httpd
+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
+endif
+
 #
 # drupal
 # 
@@ -359,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