onelab to use latest ipfw simplified versioning

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 8497d88..800ff40 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -10,7 +10,7 @@ kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@master
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-5
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
 ###

diff --git a/onelab.mk b/onelab.mk
index 627be2c..dfc095a 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -49,9 +49,6 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #