watch the right module name

diff --git a/modules.list b/modules.list
index afb1502..5f02f7a 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -25,7 +25,7 @@ drupal
 ejabberd
 fprobe-ulog
 inotify-tools
 ejabberd
 fprobe-ulog
 inotify-tools

-ipfwsrc
+ipfw

 iproute2
 iptables
 iptables:1.3.8
 iproute2
 iptables
 iptables:1.3.8

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 0789ada..8dcea2c 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -8,7 +8,7 @@ madwifi-SVNPATH                 := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.1.1-1
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.1.1-1
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###

-ipfwsrc-SVNPATH                 := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10
+ipfw-SVNPATH                    := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10

 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
 ###

diff --git a/onelab-tags.mk b/onelab-tags.mk
index a3e6a45..d8b7314 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -11,7 +11,7 @@ iptables-SVNBRANCH            := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-10
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-10
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###

-ipfwsrc-SVNPATH                 := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10
+ipfw-SVNPATH                    := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10

 nozomi-SVNPATH                 := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
 nozomi-SVNPATH                 := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4

diff --git a/onelab.mk b/onelab.mk
index 6609d37..cbd3638 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -42,7 +42,7 @@ IN_BOOTSTRAPFS += $(KERNELS)
 #
 # ipfw: root context module, and slice companion
 #
 #
 # ipfw: root context module, and slice companion
 #

-ipfwroot-MODULES := ipfwsrc
+ipfwroot-MODULES := ipfw

 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \


@@ -50,7 +50,7 @@ ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwroot
 
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwroot
 

-ipfwslice-MODULES := ipfwsrc
+ipfwslice-MODULES := ipfw

 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \