X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=kernel-2.6.spec;h=2fc6b6e282fee92b303198f3a70c9c88570de1b0;hp=bb2e2016427b75ba14aa30c9312ba2de9b032889;hb=9b08c4f6e18ab16a883f93b77158fcea60a094fe;hpb=db91bc7415b53b6a2b88762dff99269a79bd22cb

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index bb2e20164..2fc6b6e28 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,15 +10,11 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 23
+%define taglevel 35
 
 %define sublevel 32
 
-%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
 %define modern_distro 1
-%else
-%define modern_distro 0
-%endif
 #### Planet-Lab ####
 
 Summary: The Linux kernel
@@ -661,6 +657,8 @@ Source81: config-i686-debug-rhel
 Source82: config-generic
 Source83: config-x86_64-debug-rhel
 
+Patch0: linux-2.6-001-bcm5720.patch
+Patch20001: linux-2.6-002-divide-by-zero-fix.diff
 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 +679,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-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 +977,8 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
 make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
+ApplyPatch linux-2.6-001-bcm5720.patch
+ApplyPatch linux-2.6-002-divide-by-zero-fix.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 +1005,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 +1142,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 +1793,42 @@ fi
 %endif
 
 %changelog
+* Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-35
+
+* Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-34
+
+* Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-33
+- More compiletime fixes.
+
+* Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-32
+- Fixed some parantheses.
+
+* Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-31
+- For some reason the -30 tag did not get created in Linux-2.6. Might be because of a temporary problem with the git
+- server.
+
+* Tue May 01 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-30
+- Fixed a compile error.
+
+* Tue May 01 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-29
+- Renamed the latest patch file to something build doesn't reject.
+
+* Tue May 01 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-28
+- This patch adds a backported version of a patchset to support the bcm5720 chipset, used by various PlanetLab and MLab
+- members.
+
+* 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
+
 * Tue Aug 09 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-23
 - The option commented out in this patch braeks the build on f8.