X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=6643147b8170cda9ffebfa48f03945045e981f75;hb=66897e9331e007932c6d3a5f96675d38bd6deb32;hp=4303ebccbf226557ea4386000cf447bb7cb0e868;hpb=5866b57a5e271be9ed53621a4f694245a171d6b6;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 4303ebccb..6643147b8 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -35,7 +35,9 @@ Summary: The Linux kernel
 %define rhel 1
 %if %{rhel}
 %define distro_build 71.7.1
+#### Planet-Lab ####
 %define signmodules 0
+#### Planet-Lab ####
 %else
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -137,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:
 #
@@ -216,7 +220,7 @@ Summary: The Linux kernel
 %endif
 #### Planet-Lab ####
 %define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-####
+#### Planet-Lab ####
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
 %if !%{debugbuildsenabled}
@@ -510,7 +514,9 @@ AutoProv: yes\
 Name: kernel%{?variant}
 Group: System Environment/Kernel
 License: GPLv2
+#### Planet-Lab ####
 #URL: http://www.kernel.org/
+#### Planet-Lab ####
 Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
@@ -895,6 +901,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
 # Dynamically generate kernel .config files from config-* files
 make -f %{SOURCE20} VERSION=%{version} configs
 
+#### Planet-Lab ####
 ApplyPatch patch-2.6.32-71.7.1.el6-vs2.3.0.36.29.4.diff
 ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
 ApplyPatch linux-2.6-250-ipsets.patch
@@ -911,11 +918,13 @@ ApplyPatch linux-2.6-550-raise-default-nfile-ulimit.patch
 ApplyPatch linux-2.6-570-tagxid.patch
 ApplyPatch linux-2.6-580-show-proc-virt.patch
 ApplyPatch linux-2.6-590-dcookies-mm.patch
+# fails with -Wall build
 #ApplyPatch linux-2.6-591-chopstix-intern.patch
 ApplyPatch linux-2.6-640-netlink-audit-hack.patch
 ApplyPatch linux-2.6-650-hangcheck-reboot.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
+#### Planet-Lab ####
 
 ApplyOptionalPatch linux-kernel-test.patch