X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=gnuradio.mk;h=37b15e429b84e975a4efb25a85c652b295eb35e8;hb=refs%2Fremotes%2Ftrunk%401483;hp=dc01951a95396594a0114b80b55cfab94f07394e;hpb=d8d586ff63f7b6211637840b74732f944bf2b80e;p=wextoolbox.git

diff --git a/gnuradio.mk b/gnuradio.mk
index dc01951..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,8 +37,10 @@ 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
 KERNELS += kernel
 
 kernels: $(KERNELS)
@@ -53,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
 #
@@ -226,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
 #
@@ -251,29 +252,52 @@ plewww-SPEC := plewww.spec
 ALL += plewww
 IN_MYPLC += plewww
 
-### #
-### # www-register-wizard
-### #
-### www-register-wizard-MODULES := www-register-wizard
-### 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
+#
+# www-register-wizard
+#
+www-register-wizard-MODULES := www-register-wizard
+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
+
+#
+# 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
@@ -376,7 +400,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
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs