building ipfw from trunk for k32

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index bea066d..9b7ad57 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -8,7 +8,7 @@ iptables-BUILD-FROM-SRPM        := yes  # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.33-2
 ###
-ipfw-GITPATH                   := git://git.onelab.eu/ipfw@ipfw-0.9-17
+ipfw-GITPATH                   := git://git.onelab.eu/ipfw@master
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5

diff --git a/onelab.mk b/onelab.mk
index b04bb25..b4099cb 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -46,10 +46,8 @@ ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
-ifneq ($(DISTRONAME),f14)
 ALL += ipfwroot
 IN_BOOTSTRAPFS += ipfwroot
-endif
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec