X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=e6e596099fc5bbcfd4f756a32b325f85d3d170e7;hb=4d0b0c9f212cc3fe11bebccacaa53c8833b2b31e;hp=356d7bfe1232d0fed9e1f26cbe43d4fecaeac3bc;hpb=5059f3c09b8d62d119a63106ef8dbc2703fc9fc9;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 356d7bf..e6e5960 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -53,7 +53,7 @@ bbn-MODULES := bbn_80211
 bbn-SPEC := bbn_80211.spec
 bbn-BUILD-FROM-SRPM := yes
 # now from the stock repo
-bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
+bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig
 #bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
 ALL += bbn
 IN_BOOTSTRAPFS += bbn
@@ -313,6 +313,7 @@ endif
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+vsys-DEVEL-RPMS += ocaml-docs ocaml-ocamldoc
 ifeq "$(local_inotify_tools)" "true"
 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
 endif
@@ -367,6 +368,31 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
+#
+# monitor
+#
+monitor-MODULES := Monitor
+monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+ALL += monitor
+IN_BOOTSTRAPFS += monitor
+
+### #
+### # zabbix
+### #
+### zabbix-MODULES := Monitor
+### zabbix-SPEC := zabbix.spec
+### zabbix-BUILD-FROM-SRPM := yes
+### zabbix-DEVEL-RPMS += python-cherrypy
+### ALL += zabbix
+### 
+### #
+### # PLC RT
+### #
+### plcrt-MODULES := PLCRT
+### plcrt-SPEC := plcrt.spec
+### ALL += plcrt
+
 #
 # pyopenssl
 #
@@ -470,6 +496,25 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := bootstrapfs
+slicerepo-SPEC := slicerepo.spec
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #