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

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index e2db06b..6d0f3ca 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -46,6 +46,8 @@ IN_NODEIMAGE += procprotect
 #
 # ipfw: root context module, and slice companion
 #
+# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore
+#ifeq "$(DISTRONAME)" "f16"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -54,6 +56,7 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
+#endif
 
 #
 # NodeUpdate
@@ -130,13 +133,14 @@ libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 # The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-DEVEL-RPMS += xhtml1-dtds gettext libtasn1-devel gnutls-devel 
+libvirt-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
 libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
 libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
 libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
 ifeq "$(DISTRONAME)" "f16"
 libvirt-DEVEL-RPMS += libnl-devel libudev-devel
 endif
+# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
 ifeq "$(DISTRONAME)" "f18"
 libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
 libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
@@ -240,6 +244,14 @@ 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
+ALL += sliver-openvswitch
+
 #
 # plcapi
 #
@@ -248,6 +260,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
 # 
@@ -315,26 +344,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
-endif
-
 #
 # nodeconfig
 #
@@ -370,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
@@ -485,3 +495,33 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
+
+##############################
+# sfa requires python-2.7
+build_sfa=true
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
+build_sfa=false
+endif
+
+ifeq "$(build_sfa)" "true"
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
+
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+endif
+
+##############################
+# don't build these by default, we have separate builds for that
+myslice-MODULES := myslice
+myslice-SPEC := myslice.spec
+#ALL += myslice
+
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+#ALL += manifold