X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=gnuradio.mk;fp=gnuradio.mk;h=37b15e429b84e975a4efb25a85c652b295eb35e8;hp=fae014a8f09fd6761157e06c901d299107489bc9;hb=1b393f8947177108a61d2ab25e47281b3507076b;hpb=711689aacac865c4096dd8a7fe3c80c88a5dd846

diff --git a/gnuradio.mk b/gnuradio.mk
index fae014a..37b15e4 100644
--- a/gnuradio.mk
+++ b/gnuradio.mk
@@ -6,6 +6,18 @@
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
 # $Id$
+#
+### NOTES on diffs with onelab
+# 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore
+# does not include:
+# ipfw (might just work) - svn:ipfw
+# ipfwslice - svn:ipfw
+# nozomi (does not work on 2.6.27) svn:nozomi
+# comgt - svn:comgt
+# umts-backend - svn:planetlab-umts-tools
+# umts-frontend - svn:planetlab-umts-tools
+# dummynet_image - svn:dummynet_image
+
 #
 # see doc in Makefile  
 #
@@ -25,18 +37,22 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-### # 2.6.27 not yet ready for this
-#kernel-SPECVARS := iwlwifi=1
+### not needed with 2.6.27 anymore
+### kernel-SPECVARS := iwlwifi=1
 ### tmp
 kernel-RPMDATE := yes
-ALL += kernel
+KERNELS += kernel
+
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
+ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += kernel
-IN_VSERVER += kernel
-IN_BOOTSTRAPFS += kernel
+IN_BOOTCD += $(KERNELS)
+IN_VSERVER += $(KERNELS)
+IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
-IN_MYPLC += kernel
+IN_MYPLC += $(KERNELS)
 
 #
 # madwifi
@@ -51,27 +67,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-### # 2.6.27 not yet ready for this
-### # 
-### # 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
-
 #
 # util-vserver
 #
@@ -224,6 +219,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
+
 #
 # PLCAPI
 #
@@ -257,21 +260,44 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
-### #
-### # 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
+#
+# monitor
+#
+monitor-MODULES := Monitor
+monitor-SPEC := Monitor.spec
+ALL += monitor
+IN_BOOTSTRAPFS += monitor
+
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
+#
+# zabbix
+#
+zabbix-MODULES := Monitor
+zabbix-SPEC := zabbix.spec
+zabbix-BUILD-FROM-SRPM := yes
+ALL += zabbix
+
+#
+# pyopenssl
+#
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+
+
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
 
 #
 # nodeconfig