From: Jian Yu <yujian@whamcloud.com>
Date: Tue, 14 Jun 2022 22:37:52 +0000 (-0700)
Subject: LU-15795 kernel: new kernel [RHEL 8.6 4.18.0-372.9.1.el8]
X-Git-Tag: 2.15.1-RC1~41
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F47305%2F4;p=fs%2Flustre-release.git

LU-15795 kernel: new kernel [RHEL 8.6 4.18.0-372.9.1.el8]

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

Test-Parameters: trivial clientdistro=el8.6

Change-Id: Id738259ed94104c3a3c7bb5c1b853cfabad49405
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/47305
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ec1b054..328a8f2 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -25,7 +25,7 @@
          vanilla linux 5.4.136  (ZFS + ldiskfs)
        * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not
        * Client primary kernels built and tested during release cycle:
-         4.18.0-348.2.1.el8   (RHEL8.5)
+         4.18.0-372.9.1.el8   (RHEL8.6)
          5.4.0-37             (Ubuntu 20.04)
          5.3.18-59.27         (SLES15 SP3)
        * Other clients known to build on these kernels at some point (others may also work):
@@ -41,6 +41,7 @@
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
          4.18.0-305.25.1.el8  (RHEL8.4)
+         4.18.0-348.2.1.el8   (RHEL8.5)
          4.4.120-92.70        (SLES12 SP2)
          4.4.180-94.100       (SLES12 SP3)
          4.12.14-95.48        (SLES12 SP4)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 8a66bd9..ac13b38 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -3063,6 +3063,7 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
+lustre/kernel_patches/targets/4.18-rhel8.6.target
 lustre/kernel_patches/targets/4.18-rhel8.5.target
 lustre/kernel_patches/targets/4.18-rhel8.4.target
 lustre/kernel_patches/targets/4.18-rhel8.3.target
diff --git a/lustre/kernel_patches/targets/4.18-rhel8.6.target.in b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in
new file mode 100644
index 0000000..773e2a2
--- /dev/null
+++ b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in
@@ -0,0 +1,26 @@
+lnxmaj="4.18.0"
+lnxrel="372.9.1.el8"
+
+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"
+# RHEL8 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