From 7ebcba96e3442fb7d3cea3e15a4d81433c58da22 Mon Sep 17 00:00:00 2001
From: Jian Yu <yujian@whamcloud.com>
Date: Sun, 6 Jun 2021 00:38:49 -0700
Subject: [PATCH] LU-14690 kernel: new kernel [RHEL 8.4 4.18.0-305.3.1.el8_4]

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

Test-Parameters: trivial clientdistro=el8.4

Change-Id: I47d4706f9175d489ef0e6226492af20f44f0677e
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/43744
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/ChangeLog                                   |  1 +
 lustre/autoconf/lustre-core.m4                     |  1 +
 .../kernel_patches/targets/4.18-rhel8.4.target.in  | 26 ++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 lustre/kernel_patches/targets/4.18-rhel8.4.target.in

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ab823b9..5f5a13e 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -35,6 +35,7 @@ TBD Whamcloud
          4.18.0-147.3.1.el8   (RHEL8.1)
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
+         4.18.0-305.3.1.el8   (RHEL8.4)
          4.4.120-92.70        (SLES12 SP2)
          4.4.0-142            (Ubuntu 16.04)
          vanilla linux 4.15.0 (ZFS only)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 71d100a..11f2424 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -3810,6 +3810,7 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
+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
 lustre/kernel_patches/targets/4.18-rhel8.1.target
diff --git a/lustre/kernel_patches/targets/4.18-rhel8.4.target.in b/lustre/kernel_patches/targets/4.18-rhel8.4.target.in
new file mode 100644
index 0000000..d28a956
--- /dev/null
+++ b/lustre/kernel_patches/targets/4.18-rhel8.4.target.in
@@ -0,0 +1,26 @@
+lnxmaj="4.18.0"
+lnxrel="305.3.1.el8_4"
+
+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
-- 
1.8.3.1