looks like this builds fine, let's enable it

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 3739305..395bc22 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -46,10 +46,8 @@ ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
-ifneq ($(DISTRONAME),f14)
 ALL += ipfwroot
 IN_BOOTSTRAPFS += ipfwroot
-endif
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -68,10 +66,8 @@ madwifi-DEPEND-DEVEL-RPMS := kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
-ifneq ($(DISTRONAME),f14)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
-endif
 
 # 
 # nozomi
@@ -262,6 +258,14 @@ IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 endif
 
+#
+# openvswitch
+#
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
+
 #
 # vsys
 #
@@ -366,8 +370,9 @@ ALL += pyaspects
 ejabberd-MODULES := ejabberd
 ejabberd-SPEC := ejabberd.spec
 ejabberd-BUILD-FROM-SRPM := yes
-# tmp - skip on f14 for now
-ifneq ($(DISTRONAME),f14)
+# 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