X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=e4131086c11cea6e59ee0734e810287f7541b4ba;hb=778fb6118df8da36875430ca0037109daa12bb31;hp=3e6405c13643f64f4144dc68b927cbe435f0ea39;hpb=89d7694e7f4b9022573bef78068fd487e3248916;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 3e6405c..e413108 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -22,6 +22,68 @@
 # 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
+
+#
+# bbn
+#
+bbn-MODULES := bbn_80211
+bbn-SPEC := bbn_80211.spec
+bbn-BUILD-FROM-SRPM := yes
+bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
+ALL += bbn
+IN_BOOTSTRAPFS += bbn
+
+#
+# crunchxml
+#
+crunchxml-MODULES := crunchxml
+crunchxml-SPEC := crunchxml.spec
+crunchxml-BUILD-FROM-SRPM := yes
+ALL += crunchxml
+IN_BOOTSTRAPFS += crunchxml
+
+#
+# spectools
+#
+spectools-MODULES := spectools
+spectools-SPEC := spectools.spec
+spectools-BUILD-FROM-SRPM := yes
+ALL += spectools
+IN_BOOTSTRAPFS += spectools
+
+#
+# sge
+#
+sge-MODULES := sge
+sge-SPEC := sge.spec
+sge-BUILD-FROM-SRPM := yes
+# 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
+# IN_BOOTSTRAPFS += sge
+
 #
 # kernel
 #
@@ -39,8 +101,6 @@ kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
 ### not needed with 2.6.27 anymore
 ### kernel-SPECVARS := iwlwifi=1
-### tmp
-kernel-RPMDATE := yes
 KERNELS += kernel
 
 kernels: $(KERNELS)
@@ -54,6 +114,24 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 
+#
+# 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
+
 #
 # madwifi
 #
@@ -68,23 +146,23 @@ ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
 #
-# boost
+# iptables
 #
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
 
 #
-# gnuradio
+# iproute
 #
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-gnuradio-DEPEND-DEVEL-RPMS := boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
 
 #
 # util-vserver
@@ -191,25 +269,6 @@ mom-SPEC := pl_mom.spec
 ALL += mom
 IN_BOOTSTRAPFS += mom
 
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
 #
 # inotify-tools - local import
 # rebuild this on centos5 (not found) - see kexcludes in build.common
@@ -249,10 +308,10 @@ ALL += vsys-scripts
 #
 # PLCAPI
 #
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := PLCAPI
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
 
 #
 # drupal
@@ -279,6 +338,13 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
+
 #
 # monitor
 #
@@ -321,7 +387,7 @@ ALL += sfa
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -411,7 +477,7 @@ IN_MYPLC += noderepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc