From: Jian Yu <yujian@whamcloud.com>
Date: Thu, 8 Oct 2020 18:13:45 +0000 (-0700)
Subject: LU-13590 kernel: new kernel [RHEL 7.9 3.10.0-1160.2.1.el7]
X-Git-Tag: 2.12.6-RC1~33
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8f937ae28b58c18458b3c89420d2139beda53fe0;p=fs%2Flustre-release.git

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/40177
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 9e17026..76b8e4a 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -19,6 +19,7 @@ TBD Whamcloud
          3.10.0-957.27.2.el7  (RHEL7.6)
          3.10.0-1062.18.1.el7 (RHEL7.7)
          3.10.0-1127.8.2.el7  (RHEL7.8)
+         3.10.0-1160.2.1.el7  (RHEL7.9)
          4.18.0-80.11.2.el8   (RHEL8.0)
          4.4.180-94.97        (SLES12 SP3)
          4.12.14-95.54        (SLES12 SP4)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 9756e80..2148cb4 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -3790,6 +3790,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