X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=eae5238f2ffb089ad91feb560b7de546cd5e4690;hb=603ebee19acfe0294bf7f8794f0ee0d7a057716e;hp=ec0d5b1ae203271818ff3f4ce2ffd8961a06d90f;hpb=f119edb565b108258d1055a25c3af22a2971761c;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index ec0d5b1ae..eae5238f2 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -661,6 +661,7 @@ Source81: config-i686-debug-rhel
 Source82: config-generic
 Source83: config-x86_64-debug-rhel
 
+Patch0: linux-2.6-001-bcm5720.patch
 Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
 Patch3: linux-2.6-250-ipsets.patch
@@ -979,6 +980,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
 make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
+ApplyPatch linux-2.6-001-bcm5720.patch
 ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
 ApplyPatch linux-2.6-250-ipsets.patch
@@ -1142,6 +1144,11 @@ BuildKernel() {
     sed -i -e "s:-Wno-array-bounds -Werror:-Wno-array-bounds:g" Makefile
     #### Planet-Lab ####
 
+    #### Planet-Lab ####
+    # -Werror breaks F16 builds in tools/perf
+    sed -i -e "s: -Werror : :g" tools/perf/Makefile
+    #### Planet-Lab ####
+
     # and now to start the build process
 
     make -s mrproper