X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=6643147b8170cda9ffebfa48f03945045e981f75;hb=66897e9331e007932c6d3a5f96675d38bd6deb32;hp=0dbd7cace0b6ad5e92204d84f43384b829d69f25;hpb=3d21584ec2f131cfe612e2ae2b132b55054434b7;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 0dbd7cace..6643147b8 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -139,10 +139,12 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
+#### Planet-Lab ####
 # Control whether we perform a compat. check against published ABI.
-%define with_kabichk   %{?_without_kabichk:   0} %{?!_without_kabichk: 1}
+%define with_kabichk   %{?_without_kabichk:   1} %{?!_without_kabichk: 0}
 # Control whether we perform a compat. check against published ABI.
-%define with_fips      %{?_without_fips:      0} %{?!_without_fips:      1}
+%define with_fips      %{?_without_fips:      1} %{?!_without_fips:      0}
+#### Planet-Lab ####
 
 # Additional options for user-friendly one-off kernel building:
 #
@@ -905,8 +907,7 @@ ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
-# fails with -Wall build
-# ApplyPatch linux-2.6-522-iptables-connection-tagging.patch
+ApplyPatch linux-2.6-522-iptables-connection-tagging.patch
 ApplyPatch linux-2.6-523-raw-sockets.patch
 ApplyPatch linux-2.6-524-peercred.patch
 ApplyPatch linux-2.6-525-sknid-elevator.patch