LU-624 Kernel update [RHEL6.1 2.6.32-131.17.1.el6]

Change-Id: I82ef82e11f846840707f9f65ca72bcda8885c4e0
Signed-off-by: Yang Sheng <ys@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1632
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Brian J. Murrell <brian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/build/lbuild-rhel b/build/lbuild-rhel
index 87e4815..0aa22ce 100644 (file)
--- a/build/lbuild-rhel
+++ b/build/lbuild-rhel
@@ -21,8 +21,7 @@ get_rpmbuildopts() {
 # patching common to all releases
 patch_spec_common() {
 
-    sed -i -e 's/^\(%define signmodules \).*/\10/' \
-           -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
+    sed -i -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
     cp -a fs/ext3/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext3 \
     cp -a fs/ext4/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext4' \
           SPECS/$SPEC_NAME 2>&1 || \

diff --git a/build/lbuild-rhel5 b/build/lbuild-rhel5
index 6190fcd..2fd8283 100644 (file)
--- a/build/lbuild-rhel5
+++ b/build/lbuild-rhel5
@@ -28,6 +28,7 @@ Patch99995: linux-%{kversion}-lustre.patch' \
            -e '/_sourcedir\/kabitool -b \./a\
     cp $RPM_BUILD_ROOT/kabi_whitelist $RPM_SOURCE_DIR/kabi_whitelist_%{_target_cpu}$Flavour' \
            -e '/^%prep$/,/^# END OF PATCH APPLICATIONS$/s/kernel-%{kversion}/%{name}-%{kversion}/g' \
+    -e 's/^\(%define signmodules \).*/\10/' \
           SPECS/$SPEC_NAME 2>&1 || \
         fatal 1 "Error while editing SPECS/$SPEC_NAME"
 

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 77e0d31..a4acca4 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,11 +2,11 @@ TBD Whamcloud, Inc.
        * version 2.2.0
        * Server support for kernels:
          2.6.18-238.19.1.el5 (RHEL5)
-         2.6.32-131.6.1.el6 (RHEL6)
+         2.6.32-131.17.1.el6 (RHEL6)
        * Client support for unpatched kernels:
          (see http://wiki.lustre.org/index.php?title=Patchless_Client)
          2.6.18-238.19.1.el5 (RHEL5)
-         2.6.32-131.6.1.el6 (RHEL6)
+         2.6.32-131.17.1.el6 (RHEL6)
          2.6.29.4-167.fc11  (FC11)
          2.6.16.60-0.69.1 (SLES10)
          2.6.27.19-5      (SLES11)
@@ -17,6 +17,10 @@ TBD Whamcloud, Inc.
        * NFSv4 reexport requires Lustre client on the re-exporting nodes to be
          mounted with "32bitapi" mount option
 
+Severity   : enhancement
+Jira       : LU-624
+Description: Update RHEL6.1 kernel to 2.6.32-131.17.1.el6
+
 --------------------------------------------------------------------------------
 
 09-16-2011 Whamcloud, Inc.

diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in
index 47d3e36..f1c8f6d 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel6.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.32"
-lnxrel="131.6.1.el6"
+lnxrel="131.17.1.el6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=2.6-rhel6.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 1b790c8..31ce4c8 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -2,10 +2,10 @@ SERIES                VERSION                  COMMENT
 
 SUPPORTED KERNELS:
 2.6-rhel5             RHEL5: 2.6.18-238.19.1.el5
-2.6-rhel6             RHEL6: 2.6.32-131.6.1.el6
+2.6-rhel6             RHEL6: 2.6.32-131.17.1.el6
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
          2.6.18-238.19.1.el5 (RHEL5)
-         2.6.32-131.6.1.el6 (RHEL6)
+         2.6.32-131.17.1.el6 (RHEL6)
          2.6.16.60-0.69.1 (SLES10)
          2.6.27.19-5      (SLES11)