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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index f994fa0cc..eae5238f2 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 24
+%define taglevel 27
 
 %define sublevel 32
 
@@ -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
@@ -681,13 +682,13 @@ Patch17: linux-2.6-640-netlink-audit-hack.patch
 Patch18: linux-2.6-650-hangcheck-reboot.patch
 Patch19: linux-2.6-660-nmi-watchdog-default.patch
 Patch20: linux-2.6-680-htb-hysteresis-tso.patch
-Patch21: linux-2.6-911-perftools-f8-build.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch
 Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
 Patch10002: linux-2.6-10002-gcc-4.6-sense_buffer.patch
 Patch10003: linux-2.6-10003-gcc-4.6-vdso.patch
 Patch10004: linux-2.6-10004-gcc-4.6-perf.patch
+Patch10911: linux-2.6-10911-perftools-f8-build.patch
 # empty final patch file to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.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
@@ -1005,6 +1007,7 @@ ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
 ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
 ApplyPatch linux-2.6-10003-gcc-4.6-vdso.patch
 ApplyPatch linux-2.6-10004-gcc-4.6-perf.patch
+ApplyPatch linux-2.6-10911-perftools-f8-build.patch
 #### Planet-Lab ####
 
 ApplyOptionalPatch linux-kernel-test.patch
@@ -1141,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
@@ -1787,6 +1795,15 @@ fi
 %endif
 
 %changelog
+* Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-27
+- 2 places for pulling sources from in case of network outage
+
+* Wed Oct 05 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-26
+- Tweak to the f8 build-fixing patch
+
+* Tue Oct 04 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-25
+- Apply f8-build-fixing patch
+
 * Mon Aug 15 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-24
 - fix patch filename