X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=2efb39dd62eb9832fdcdc2ec4ed4da63c3356dbf;hb=84d2502845a036f0dd713f1079ea4ee1af2760d1;hp=3daedd1a36cb1ecec9dd6696a5a1a87e7526e326;hpb=959ebfdc3b6e399a11c721e18f58847778c77331;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 3daedd1a..2efb39dd 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -258,15 +258,17 @@ IN_NODEIMAGE += inotify-tools
 ALL += inotify-tools
 endif
 
-#
-# openvswitch
-#
-openvswitch-MODULES := openvswitch
-openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-# maybe not in production yet
-#IN_NODEIMAGE += openvswitch
-ALL += openvswitch
+# #
+# # openvswitch
+# #
+# openvswitch-MODULES := openvswitch
+# openvswitch-SPEC := openvswitch.spec
+# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# 
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+# IN_NODEIMAGE += openvswitch
+# ALL += openvswitch
+# endif
 
 #
 # vsys
@@ -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