more cleanup

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 51cea7b..5cda390 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -54,17 +54,3 @@ DistributedRateLimiting-SVNPATH      := http://svn.planet-lab.org/svn/DistributedRate
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-27
 
-### temporary
-# nozomi not needed anymore for 2.6.27
-ALL:=$(subst nozomi,,$(ALL))
-IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))
-
-#################### tmp - build the vini nm plugin
-NodeManager-topo-MODULES               := NodeManager-topo
-NodeManager-topo-SPEC                  := NodeManager-topo.spec
-NodeManager-topo-SVNPATH               := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
-NodeManager-topo-BUILD-FROM-SRPM       := yes
-# can't be figured from the specfile
-NodeManager-topo.source                        := nodemanager-topo
-# build this package but do not ship
-ALL += NodeManager-topo                                                                                                                                

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 4f9cd06..be245de 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -61,7 +61,3 @@ DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRate
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-27
 
-### temporary
-# nozomi not needed anymore for 2.6.27
-ALL:=$(subst nozomi,,$(ALL))
-IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))

diff --git a/onelab.mk b/onelab.mk
index f8697d6..5a6feab 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -69,18 +69,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
 #