From: Jian Yu <yujian@whamcloud.com>
Date: Wed, 7 Oct 2020 00:09:32 +0000 (-0700)
Subject: LU-13590 kernel: new kernel [RHEL 7.9 3.10.0-1160.2.1.el7]
X-Git-Tag: 2.13.57~145
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=1bfbc743e1ed4f0ba9715a3a34e50b9110e167bc

LU-13590 kernel: new kernel [RHEL 7.9 3.10.0-1160.2.1.el7]

This patch makes changes to support new RHEL 7.9 release
for Lustre client.

Test-Parameters: trivial clientdistro=el7.9

Change-Id: I7a2846de48a6710d6d720d6ccc3176dba4afc6bb
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/40142
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c8fd863..15f0220 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -20,6 +20,7 @@ TBD Whamcloud
        * Client primary kernels built and tested during release cycle:
          3.10.0-1062.18.1.el7 (RHEL7.7)
          3.10.0-1127.19.1.el7 (RHEL7.8)
+         3.10.0-1160.2.1.el7  (RHEL7.9)
          4.12.14-95.48        (SLES12 SP4)
          4.12.14-122.20       (SLES12 SP5)
          4.12.14-197.37       (SLES15 SP1)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index e9b2928..b468523 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2839,6 +2839,7 @@ lustre/include/uapi/linux/lustre/Makefile
 lustre/kernel_patches/targets/4.18-rhel8.2.target
 lustre/kernel_patches/targets/4.18-rhel8.1.target
 lustre/kernel_patches/targets/4.18-rhel8.target
+lustre/kernel_patches/targets/3.10-rhel7.9.target
 lustre/kernel_patches/targets/3.10-rhel7.8.target
 lustre/kernel_patches/targets/3.10-rhel7.7.target
 lustre/kernel_patches/targets/3.10-rhel7.6.target
diff --git a/lustre/kernel_patches/targets/3.10-rhel7.9.target.in b/lustre/kernel_patches/targets/3.10-rhel7.9.target.in
new file mode 100644
index 0000000..a407171
--- /dev/null
+++ b/lustre/kernel_patches/targets/3.10-rhel7.9.target.in
@@ -0,0 +1,26 @@
+lnxmaj="3.10.0"
+lnxrel="1160.2.1.el7"
+
+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