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

diff --git a/gnuradio.mk b/gnuradio.mk
index 343ecd8..37b15e4 100644
--- a/gnuradio.mk
+++ b/gnuradio.mk
@@ -5,7 +5,19 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id: onelab.mk 12446 2009-03-12 00:09:58Z thierry $
+# $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,26 +67,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-# 
-# 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,12 +220,12 @@ IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
 #
-# dummynet_image
-# 
-dummynet_image-MODULES := dummynet_image
-dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
-ALL += dummynet_image
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
 
 #
 # PLCAPI
@@ -274,6 +268,13 @@ monitor-SPEC := Monitor.spec
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
 #
 # zabbix
 #
@@ -282,6 +283,22 @@ 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
 #
@@ -383,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