X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=3a0281868308acffe8680b069c238c9316e4de5a;hb=d0efbebbf5ecc0153c50c5d8ddf810fabda644d6;hp=08d2b7ddb38bb250b548fe402659424d83430be1;hpb=34a9a5c57838259b0121cbbdb2b08b77c08e2073;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 08d2b7d..3a02818 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -48,9 +48,10 @@ IN_BOOTSTRAPFS += gnuradio
 #
 # bbn
 #
-bbn-MODULES := 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
 
@@ -72,6 +73,17 @@ 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
 #
@@ -89,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)
@@ -104,6 +114,24 @@ 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
 #
@@ -117,6 +145,25 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
+#
+# 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
+
 #
 # util-vserver
 #
@@ -222,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
@@ -280,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
@@ -310,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
 #
@@ -341,6 +376,13 @@ pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
 
 #
 # sfa - Slice Facility Architecture
@@ -352,7 +394,7 @@ ALL += sfa
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -442,7 +484,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