X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=e672d6861539d1f18b847ff9b074b1931fd5cecf;hb=9c97c96fe6c048f1ac54c3a2a89694f1ba72da03;hp=1854b6929b30a575939a572a9c838d5ab58c26ae;hpb=646cb3a3cac85535c4dad844c94f478a2d01b037;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 1854b692..e672d686 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -110,9 +110,6 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -271,6 +268,8 @@ ALL += openvswitch
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
 vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
@@ -341,7 +340,8 @@ zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
 zabbix-DEVEL-RPMS += python-cherrypy
-ALL += zabbix
+### turn this off as zabbix comes with stock fedora or epel
+###ALL += zabbix
 
 #
 # PLC RT
@@ -447,6 +447,14 @@ omf-expctl-MODULES := omf
 omf-expctl-SPEC := omf-expctl.spec
 ALL += omf-expctl
 
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel 
+oml-SPEC := liboml.spec
+ALL += oml
+
 #
 # bootcd
 #
@@ -524,7 +532,6 @@ ALL += slicerepo
 #
 myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
-myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
 
 # myplc-docs only contains docs for PLCAPI and NMAPI, but