Update .mk files according the new ipfw source structure (from Rev. 16174)

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 6860368..0720349 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -5,7 +5,7 @@
 linux-2.6-SVNBRANCH            := 22
 # not adopting tag 40 about "VXC_PROC_WRITE support" - should be safe but Sapan advised keeping it out was safer still
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-39-1
-ipfw-SVNPATH                   := http://svn.planet-lab.org/svn/ipfw/trunk
+ipfwsrc-SVNPATH                        := http://svn.planet-lab.org/svn/ipfw/trunk
 madwifi-SVNBRANCH              := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
 nozomi-SVNPATH                 := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1

diff --git a/onelab.mk b/onelab.mk
index a7c4681..be3b358 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -43,21 +43,19 @@ IN_MYPLC += $(KERNELS)
 #
 # ipfw: root context module, and slice companion
 #
-ipfw-MODULES := ipfw
-ipfw-SPEC := ipfw.spec
-ipfw-DEPEND-DEVEL-RPMS := kernel-devel
-ipfw-SPECVARS = kernel_version=$(kernel.rpm-version) \
-       kernel_release=$(kernel.rpm-release) \
-       kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += ipfw
-ALL += ipfw
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := ipfw-slice.spec
+ipfwroot-MODULES := ipfwsrc
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
+ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwroot
+
+ipfwslice-MODULES := ipfwsrc
+ipfwslice-SPEC := planetlab/ipfwslice.spec
 ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-       kernel_release=$(kernel.rpm-release) \
-       kernel_arch=$(kernel.rpm-arch)
-IN_VSERVER += ipfwslice
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #