X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=97d7a33cbd53f80632a64a7caa76d29b98dd6cb3;hb=198e451e04b4607194df7af19c0a7305b5a23184;hp=e7bc7f7cd478db502a6ff6db2869480f9bff371b;hpb=124361469919d42bc6cccbd04ef071af70e6fdcb;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index e7bc7f7..97d7a33 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,6 @@ 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
 
 #
 # madwifi
@@ -148,7 +139,6 @@ IN_BOOTSTRAPFS += madwifi
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -163,6 +153,40 @@ IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute
 IN_BOOTCD += iproute
 
+#
+# 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
+
+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
+
+#
+# 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
+
 #
 # util-vserver
 #
@@ -207,7 +231,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
@@ -223,7 +247,7 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
@@ -239,9 +263,8 @@ IN_BOOTSTRAPFS += sshd
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
-#codemux-RPMBUILD := bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
@@ -290,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
@@ -305,7 +329,7 @@ IN_BOOTSTRAPFS += vsys-scripts
 ALL += vsys-scripts
 
 #
-# plcapi
+# PLCAPI
 #
 plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
@@ -344,29 +368,6 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-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
-
 #
 # pyopenssl
 #
@@ -383,19 +384,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-#
-# 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
-
 #
 # nodeconfig
 #
@@ -407,7 +395,7 @@ IN_MYPLC += nodeconfig
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
 IN_MYPLC += bootmanager
@@ -430,27 +418,11 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-#
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_VSERVER += omf-resctl
-
-#
-# OMF exp controller
-#
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
-
 #
 # bootcd
 #
-bootcd-MODULES := BootCD build
+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
@@ -460,7 +432,7 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
 vserver-SPEC := vserver-reference.spec
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
@@ -471,9 +443,8 @@ IN_BOOTSTRAPFS += vserver
 #
 # bootstrapfs
 #
-bootstrapfs-MODULES := BootstrapFS build
+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
@@ -484,16 +455,15 @@ IN_MYPLC += bootstrapfs
 # noderepo
 #
 # all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
 # replace space with +++ (specvars cannot deal with spaces)
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
-noderepo-MODULES := BootstrapFS 
+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)
+# package requires all regular packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
@@ -501,30 +471,10 @@ 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
-slicerepo-RPMBUILD := bash ./rpmbuild.sh
-# 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
 #
-myplc-MODULES := MyPLC
+myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
@@ -532,12 +482,12 @@ 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
 
 # using some other name than myplc-release, as this is a make target already
-release-MODULES := MyPLC
+release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release