X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=eeb33c7c29affc8deb49126bd1e4e2b5fb75a84b;hb=refs%2Fheads%2Frhel;hp=8b8b7612ac5207fb37d5c6d87319ece13f47e1fb;hpb=0704a877f225262701c4076d16e933d8f92f854c;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 8b8b7612a..eeb33c7c2 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -689,6 +689,7 @@ Patch19: linux-2.6-660-nmi-watchdog-default.patch
 Patch20: linux-2.6-680-htb-hysteresis-tso.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch
+Patch10001: linux-2.6-10001-f16-fix.patch
 # empty final patch file to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 
@@ -985,6 +986,7 @@ 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
 ApplyPatch linux-2.6-10000-gcc-4.5.patch
+ApplyPatch linux-2.6-10001-f16-fix.patch
 #### Planet-Lab ####
 
 ApplyOptionalPatch linux-kernel-test.patch
@@ -1117,8 +1119,9 @@ BuildKernel() {
     %endif
 
     #### Planet-Lab ####
-    # -Werror breaks F14 builds
+    # -Werror breaks F14+ builds
     sed -i -e "s:-Wno-array-bounds -Werror:-Wno-array-bounds:g" Makefile
+    sed -i -e "s: -Werror::g" tools/perf/Makefile
     #### Planet-Lab ####
 
     # and now to start the build process