lxc build to use lxc branch of bootcd

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index ce7c30d..bdaa655 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -264,9 +264,11 @@ endif
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-# maybe not in production yet
-#IN_NODEIMAGE += openvswitch
+
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+IN_NODEIMAGE += openvswitch
 ALL += openvswitch
+endif
 
 #
 # vsys
@@ -286,7 +288,7 @@ ALL += vsys
 #
 vsyssh-MODULES := vsys
 vsyssh-SPEC := vsyssh.spec
-IN_SLIVER += vsyssh
+IN_SLICEIMAGE += vsyssh
 ALL += vsyssh
 
 #
@@ -372,19 +374,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ejabberd-DEVEL-RPMS += erlang pam-devel hevea
-# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
-# so, this is relevant on f8 and centos5 only
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-ALL += ejabberd
-endif
-
 # 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
@@ -474,7 +463,7 @@ ALL += bootcd
 IN_MYPLC += bootcd
 
 #
-# vserver : reference image for slices
+# images for slices
 #
 sliceimage-MODULES := sliceimage build
 sliceimage-SPEC := sliceimage.spec
@@ -484,6 +473,15 @@ sliceimage-RPMDATE := yes
 ALL += sliceimage
 IN_NODEIMAGE += sliceimage
 
+#
+# vserver-specific sliceimage initialization
+# 
+vserver-sliceimage-MODULES := sliceimage
+vserver-sliceimage-SPEC    := vserver-sliceimage.spec
+vserver-sliceimage-RPMDATE := yes
+ALL                       += vserver-sliceimage
+IN_NODEIMAGE              += vserver-sliceimage
+
 #
 # nodeimage
 #