fixed nozomi spec, but it does not compile against 2.6.22 - waiting for roberto

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 6759613..c3102b2 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -4,7 +4,7 @@ build-SVNPATH                   := http://svn.planet-lab.org/svn/build/trunk
 linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk

-nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/imports/2.21alpha_060917
+nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk

 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz

diff --git a/onelab.mk b/onelab.mk
index 117ccc9..ebe6ae8 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -77,20 +77,19 @@ IN_BOOTSTRAPFS += wireless-tools
 # 
 # nozomi
 # 
 # 
 # nozomi
 # 

-
+# does not compile against new kernel - waiting for Napoli & Vimercate

 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)
 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
+#IN_BOOTSTRAPFS += nozomi
+#ALL += nozomi

 
 #
 # comgt
 # 
 
 #
 # comgt
 # 

-

 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt