Setting tag linux-2.6-32-2

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index ba84a0b..e001a05 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %(echo %{url} | cut -d ' ' -f 2)
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 1
+%define taglevel 2
 
 %define sublevel 32
 #### Planet-Lab ####
@@ -645,7 +645,7 @@ Patch12: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch13: linux-2.6-570-tagxid.patch
 Patch14: linux-2.6-580-show-proc-virt.patch
 Patch15: linux-2.6-590-dcookies-mm.patch
-#Patch16: linux-2.6-591-chopstix-intern.patch
+Patch16: linux-2.6-591-chopstix-intern.patch
 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
@@ -941,8 +941,7 @@ 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-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
@@ -1078,6 +1077,11 @@ BuildKernel() {
     %endif
     %endif
 
+    #### Planet-Lab ####
+    # -Werror breaks F14 builds
+    sed -i -e "s:-Wno-array-bounds -Werror:-Wno-array-bounds:g" Makefile
+    #### Planet-Lab ####
+
     # and now to start the build process
 
     make -s mrproper
@@ -1724,6 +1728,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 10 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-2
+- Fix F14 build problems
+
 * Wed Dec 08 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-1
 - Bump to latest RHEL6 kernel