X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=e6e596099fc5bbcfd4f756a32b325f85d3d170e7;hb=4d0b0c9f212cc3fe11bebccacaa53c8833b2b31e;hp=c6bd80a5fd5449377d63424affe24d1b7f1275a7;hpb=849b12dede4c9b536162ceddafa66d2012c5b3e8;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index c6bd80a..e6e5960 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -30,6 +30,7 @@
 #f14# boost-MODULES := boost
 #f14# boost-SPEC := boost.spec
 #f14# boost-BUILD-FROM-SRPM := yes
+#f14# boost-DEVEL-RPMS := bzip2-devel libicu-devel chrpath
 #f14# ALL += boost
 #f14# IN_BOOTSTRAPFS += boost
 #f14# 
@@ -39,6 +40,7 @@
 #f14# gnuradio-MODULES := gnuradio
 #f14# gnuradio-SPEC := gnuradio.spec
 #f14# gnuradio-BUILD-FROM-SRPM := yes
+#f14# gnuradio-DEVEL-RPMS := python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit fftw-devel gsl-devel libusb-devel cppunit-devel
 #f14# # boost-devel needs boost !
 #f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
 #f14# ALL += gnuradio
@@ -50,7 +52,9 @@
 bbn-MODULES := bbn_80211
 bbn-SPEC := bbn_80211.spec
 bbn-BUILD-FROM-SRPM := yes
-bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
+# now from the stock repo
+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
 
@@ -60,6 +64,7 @@ IN_BOOTSTRAPFS += bbn
 crunchxml-MODULES := crunchxml
 crunchxml-SPEC := crunchxml.spec
 crunchxml-BUILD-FROM-SRPM := yes
+crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons
 ALL += crunchxml
 IN_BOOTSTRAPFS += crunchxml
 
@@ -69,6 +74,7 @@ IN_BOOTSTRAPFS += crunchxml
 spectools-MODULES := spectools
 spectools-SPEC := spectools.spec
 spectools-BUILD-FROM-SRPM := yes
+spectools-DEVEL-RPMS := gtk2-devel
 ALL += spectools
 IN_BOOTSTRAPFS += spectools
 
@@ -78,6 +84,9 @@ IN_BOOTSTRAPFS += spectools
 sge-MODULES := sge
 sge-SPEC := sge.spec
 sge-BUILD-FROM-SRPM := yes
+sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk 
+sge-DEVEL-RPMS += lesstif lesstif-devel
+
 # turning this off - current focus is on deploying the sge box separately from myplc
 # packaging is still broken, and we're exploring a ready-t-o-use distro on centos
 # ALL += sge
@@ -238,7 +247,7 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
@@ -254,7 +263,7 @@ IN_BOOTSTRAPFS += sshd
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
@@ -304,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
@@ -358,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
 #
@@ -461,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
 #