X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=wextoolbox.mk;h=ead3514199fa85f6f8e6198d397e6a513cb42ade;hp=e91e8a4a0f8c3353108986c21eda5e8f5022d212;hb=c758c9c55c16ded55519ec0ea03949e1a7583d09;hpb=518ce9de4ccebff1764302b522030f16d0c04d46

diff --git a/wextoolbox.mk b/wextoolbox.mk
index e91e8a4..ead3514 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -20,28 +20,31 @@
 # see doc in Makefile  
 #
 
-#
-# boost
-# 
-# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
-# this build is based on the f11 rpm, i.e. boost-1.37
-#
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
-
-#
-# gnuradio
-#
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-# boost-devel needs boost !
-gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
+########## this should not be needed with f14 anymore 
+#f14# #
+#f14# # boost
+#f14# # 
+#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
+#f14# # this build is based on the f11 rpm, i.e. boost-1.37
+#f14# #
+#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# 
+#f14# #
+#f14# # gnuradio
+#f14# #
+#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
+#f14# IN_BOOTSTRAPFS += gnuradio
 
 #
 # bbn
@@ -49,7 +52,9 @@ IN_BOOTSTRAPFS += gnuradio
 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
 
@@ -59,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
 
@@ -68,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
 
@@ -77,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
@@ -97,8 +107,9 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-### not needed with 2.6.27 anymore
-### kernel-SPECVARS := iwlwifi=1
+# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
+kernel-SPECVARS += iwlwifi=1 
+kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
 
 kernels: $(KERNELS)
@@ -109,26 +120,25 @@ ALL += $(KERNELS)
 IN_BOOTCD += $(KERNELS)
 IN_VSERVER += $(KERNELS)
 IN_BOOTSTRAPFS += $(KERNELS)
-# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
-
-#-broken-# #
-#-broken-# # ipfw: root context module, and slice companion
-#-broken-# #
-#-broken-# ipfwroot-MODULES := ipfw
-#-broken-# ipfwroot-SPEC := planetlab/ipfwroot.spec
-#-broken-# ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
-#-broken-# ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
-#-broken-#         kernel_release=$(kernel.rpm-release) \
-#-broken-#         kernel_arch=$(kernel.rpm-arch)
-#-broken-# ALL += ipfwroot
-#-broken-# 
-#-broken-# ipfwslice-MODULES := ipfw
-#-broken-# ipfwslice-SPEC := planetlab/ipfwslice.spec
-#-broken-# ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-#-broken-#         kernel_release=$(kernel.rpm-release) \
-#-broken-#         kernel_arch=$(kernel.rpm-arch)
-#-broken-# ALL += ipfwslice
+
+#
+# ipfw: root context module, and slice companion
+#
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ipfwroot-DEPEND-DEVEL-RPMS += kernel-devel
+ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwroot
+IN_BOOTSTRAPFS += ipfwroot
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwslice
 
 #
 # madwifi
@@ -136,20 +146,55 @@ IN_MYPLC += $(KERNELS)
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_release=$(kernel.rpm-release) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
+### # 
+### # nozomi
+### # 
+### nozomi-MODULES := nozomi
+### nozomi-SPEC := nozomi.spec
+### nozomi-DEPEND-DEVEL-RPMS += kernel-devel
+### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+### 	kernel_release=$(kernel.rpm-release) \
+### 	kernel_arch=$(kernel.rpm-arch)
+### IN_BOOTSTRAPFS += nozomi
+### ALL += nozomi
+
+### #
+### # comgt
+### # 
+### comgt-MODULES := comgt
+### comgt-SPEC := comgt.spec
+### IN_BOOTSTRAPFS += comgt
+### ALL += comgt
+
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_BOOTSTRAPFS += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_VSERVER += umts-frontend
+ALL += umts-frontend
+
 #
 # iptables
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -175,7 +220,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see yumexclude
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
@@ -187,7 +232,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
 endif
@@ -197,7 +242,7 @@ endif
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core 
+util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
 util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
 endif
@@ -241,7 +286,6 @@ IN_BOOTSTRAPFS += sshd
 #
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
-#codemux-RPMBUILD := bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
@@ -253,6 +297,15 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+### #
+### # DistributedRateLimiting
+### #
+### DistributedRateLimiting-MODULES := DistributedRateLimiting
+### DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+### ALL += DistributedRateLimiting
+### IN_NODEREPO += DistributedRateLimiting
+
+
 #
 # pf2slice
 #
@@ -270,7 +323,7 @@ IN_BOOTSTRAPFS += mom
 
 #
 # inotify-tools - local import
-# rebuild this on centos5 (not found) - see kexcludes in build.common
+# rebuild this on centos5 (not found) - see yumexclude
 #
 local_inotify_tools=false
 ifeq "$(DISTRONAME)" "centos5"
@@ -285,13 +338,23 @@ IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 endif
 
+### #
+### # openvswitch
+### #
+### openvswitch-MODULES := openvswitch
+### openvswitch-SPEC := openvswitch.spec
+### openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+### IN_BOOTSTRAPFS += openvswitch
+### ALL += openvswitch
+
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+vsys-DEVEL-RPMS += ocaml-ocamldoc
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
@@ -349,23 +412,25 @@ ALL += pcucontrol
 #
 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
-ALL += zabbix
-
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
+### #
+### # 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
@@ -383,25 +448,37 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ALL += ejabberd
-
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-build_sfa=false
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-endif
+### #
+### # 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__
+### build_sfa=true
+### ifeq "$(DISTRONAME)" "centos5"
+### build_sfa=false
+### endif
+
+### ifeq "$(build_sfa)" "true"
+### #
+### # sfa - Slice Facility Architecture
+### #
+### sfa-MODULES := sfa
+### sfa-SPEC := sfa.spec
+### ALL += sfa
+### endif
+
+### sface-MODULES := sface
+### sface-SPEC := sface.spec
+### ALL += sface
 
 #
 # nodeconfig
@@ -452,12 +529,19 @@ 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
 #
 bootcd-MODULES := bootcd build
 bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
@@ -480,7 +564,6 @@ IN_BOOTSTRAPFS += vserver
 #
 bootstrapfs-MODULES := bootstrapfs build
 bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
@@ -498,7 +581,6 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
 noderepo-MODULES := bootstrapfs
 noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all embedded packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
@@ -519,7 +601,6 @@ SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
 
 slicerepo-MODULES := bootstrapfs
 slicerepo-SPEC := slicerepo.spec
-slicerepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all embedded packages
 slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
 slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
@@ -539,7 +620,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager 
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs