From: Jian Yu <yujian@whamcloud.com>
Date: Wed, 17 Nov 2021 19:58:14 +0000 (-0800)
Subject: LU-15126 kernel: new kernel [RHEL 8.5 4.18.0-348.2.1.el8_5]
X-Git-Tag: 2.14.56~35
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=951f31789f76295d182f56bef1fa8d92f69e7e2a

LU-15126 kernel: new kernel [RHEL 8.5 4.18.0-348.2.1.el8_5]

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

Test-Parameters: trivial env=SANITY_EXCEPT="101j" \
clientdistro=el8.5

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

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index cc1cd20..2eb2d81 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -43,6 +43,7 @@ TBD Whamcloud
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
          4.18.0-305.19.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.4.0-131            (Ubuntu 16.04)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 66d5256..daece66 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2993,6 +2993,7 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
+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
 lustre/kernel_patches/targets/4.18-rhel8.2.target
diff --git a/lustre/kernel_patches/targets/4.18-rhel8.5.target.in b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in
new file mode 100644
index 0000000..9ff6013
--- /dev/null
+++ b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in
@@ -0,0 +1,26 @@
+lnxmaj="4.18.0"
+lnxrel="348.2.1.el8_5"
+
+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