branch name changed

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 442586b..1d1d78f 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -49,6 +49,7 @@ ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwroot
+IN_BOOTSTRAPFS += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -115,6 +116,9 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
+ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
+iptables-BUILD-FROM-SRPM := yes
+endif
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables