From 884704be2d81e9e5bec704d934f0d0651c8db20f Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 25 Jul 2018 01:08:54 -0700 Subject: [PATCH] LU-11167 kernel: new kernel [RHEL6.10 2.6.32-754.el6] This patch makes changes to support new RHEL 6.10 release for Lustre client. Test-Parameters: clientdistro=el6.10 Change-Id: I4cec46b0189f1fc6779e15b6dca76bcf9d607bbc Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/32873 Tested-by: Jenkins Reviewed-by: Yang Sheng Tested-by: Maloo Reviewed-by: John L. Hammond --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 41 ++++++++++++++++++++++ lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/2.6-rhel6.10.target.in | 26 ++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 lustre/kernel_patches/targets/2.6-rhel6.10.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index cd1be96..38022ca 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -192,6 +192,7 @@ autodetect_target() { case ${distro} in oel5*) target="2.6-oel5";; rhel5*) target="2.6-rhel5";; + rhel6.10) target="2.6-rhel6.10";; rhel6.9) target="2.6-rhel6.9";; rhel6.8) target="2.6-rhel6.8";; rhel6.7) target="2.6-rhel6.7";; diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 0123cd3..81ad978 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,3 +1,44 @@ +TBD Whamcloud + * version 2.10.5 + * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix + for currently supported client and server kernel versions. + * Server known to build on patched kernels: + 2.6.32-431.29.2.el6 (RHEL6.5) + 2.6.32-504.30.3.el6 (RHEL6.6) + 2.6.32-573.26.1.el6 (RHEL6.7) + 2.6.32-642.15.1.el6 (RHEL6.8) + 2.6.32-696.30.1.el6 (RHEL6.9) + 3.10.0-862.3.2.el7 (RHEL7.5) + 3.0.101-0.47.71 (SLES11 SP3) + 3.0.101-107 (SLES11 SP4) + 3.12.74-60.64.40 (SLES12 SP1) + 4.4.120-92.70 (SLES12 SP2) + 4.4.132-94.33 (SLES12 SP3) + vanilla linux 4.6.7 (ZFS only) + * Client known to build on unpatched kernels: + 2.6.32-431.29.2.el6 (RHEL6.5) + 2.6.32-504.30.3.el6 (RHEL6.6) + 2.6.32-573.26.1.el6 (RHEL6.7) + 2.6.32-642.15.1.el6 (RHEL6.8) + 2.6.32-696.30.1.el6 (RHEL6.9) + 2.6.32-754.el6 (RHEL6.10) + 3.10.0-862.3.2.el7 (RHEL7.5) + 3.0.101-0.47.71 (SLES11 SP3) + 3.0.101-107 (SLES11 SP4) + 3.12.74-60.64.40 (SLES12 SP1) + 4.4.120-92.70 (SLES12 SP2) + 4.4.133-94.33 (SLES12 SP3) + 4.4.0-116 (Ubuntu 16.04) + vanilla linux 4.6.7 + * Recommended e2fsprogs version: 1.42.13.wc6 or newer + * Recommended ZFS / SPL version: 0.7.9 + * Tested with ZFS / SPL version: 0.7.9 + * NFS export disabled when stack size < 8192 (32-bit Lustre clients), + since the NFSv4 export of Lustre filesystem with 4K stack may cause a + stack overflow. For more information, please refer to bugzilla 17630. + * NFSv4 reexport to 32-bit NFS client nodes requires Lustre client on + the re-exporting nodes to be mounted with "32bitapi" mount option + 05-22-2018 Intel Corporation * version 2.10.4 * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 0f54320..85842f0 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3262,6 +3262,7 @@ lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/Makefile lustre/kernel_patches/targets/3.10-rhel7.target +lustre/kernel_patches/targets/2.6-rhel6.10.target lustre/kernel_patches/targets/2.6-rhel6.9.target lustre/kernel_patches/targets/2.6-rhel6.8.target lustre/kernel_patches/targets/2.6-rhel6.7.target diff --git a/lustre/kernel_patches/targets/2.6-rhel6.10.target.in b/lustre/kernel_patches/targets/2.6-rhel6.10.target.in new file mode 100644 index 0000000..0e642da --- /dev/null +++ b/lustre/kernel_patches/targets/2.6-rhel6.10.target.in @@ -0,0 +1,26 @@ +lnxmaj="2.6.32" +lnxrel="754.el6" + +KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm +SERIES="" +EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ +LUSTRE_VERSION=@VERSION@ + +DEVEL_PATH_ARCH_DELIMETER="." +OFED_VERSION=inkernel + +BASE_ARCHS="i686 x86_64 ia64 ppc64" +BIGMEM_ARCHS="" +BOOT_ARCHS="" +JENSEN_ARCHS="" +#SMP_ARCHS="i686 x86_64 ia64 ppc64" +# RHEL5 doesn't use smp specific kernels +SMP_ARCHS="" +UP_ARCHS="" + +for cc in gcc ; do + if which $cc >/dev/null 2>/dev/null ; then + export CC=$cc + break + fi +done -- 1.8.3.1