git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag nodeconfig-4.3-8
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
1854b69
..
e672d68
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-110,9
+110,6
@@
ALL += umts-frontend
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
#
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
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
#
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
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
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
#
# PLC RT
@@
-447,6
+447,14
@@
omf-expctl-MODULES := omf
omf-expctl-SPEC := omf-expctl.spec
ALL += omf-expctl
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
#
#
# bootcd
#
@@
-524,7
+532,6
@@
ALL += slicerepo
#
myplc-MODULES := myplc
myplc-SPEC := myplc.spec
#
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
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but