From: Jian Yu <yujian@whamcloud.com>
Date: Wed, 17 May 2023 00:12:13 +0000 (-0700)
Subject: LU-16756 kernel: new kernel [RHEL 9.2 5.14.0-284.11.1.el9_2]
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f93e0e02cdf37fd415f63c758d8d627577f9d316;p=fs%2Flustre-release.git

LU-16756 kernel: new kernel [RHEL 9.2 5.14.0-284.11.1.el9_2]

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

Lustre-change: https://review.whamcloud.com/50745
Lustre-commit: dd390cd315f505456e8e8a29e16a0f24b6878e27

Test-Parameters: trivial env=SANITY_EXCEPT=27J clientdistro=el9.2 testlist=sanity
Test-Parameters: trivial env=SANITY_EXCEPT=27J clientdistro=el9.2 serverdistro=el8.7 testlist=sanity

Change-Id: I4886bbf30d6d6a93c4adbfb68871e9d91f5b64de
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50964
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh
index 3c4f58b..a6c3947 100644
--- a/contrib/lbuild/funcs.sh
+++ b/contrib/lbuild/funcs.sh
@@ -194,6 +194,7 @@ autodetect_target() {
          rhel8*)  target="4.18-rhel8";;
 	rhel-9.0) target="5.14-rhel9.0";;
 	rhel-9.1) target="5.14-rhel9.1";;
+	rhel-9.2) target="5.14-rhel9.2";;
         sles11.4) target="$(uname -r | cut -d . -f 1,2)-sles11sp4";;
         sles11.3) target="$(uname -r | cut -d . -f 1,2)-sles11sp3";;
         sles11*)  target="$(uname -r | cut -d . -f 1,2)-sles11";;
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 7fc254c..f730d845 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -27,6 +27,7 @@
          4.18.0-477.el8       (RHEL8.8)
          5.14.0-70.30.1.el9   (RHEL9.0)
          5.14.0-162.23.1.el9  (RHEL9.1)
+         5.14.0-284.11.1.el9  (RHEL9.2)
          5.3.18-150300.59.93  (SLES15 SP3)
          5.14.21-150400.24.46 (SLES15 SP4)
          5.4.0-131            (Ubuntu 20.04)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 3fc613e..d7fe681 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -3464,6 +3464,7 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
+lustre/kernel_patches/targets/5.14-rhel9.2.target
 lustre/kernel_patches/targets/5.14-rhel9.1.target
 lustre/kernel_patches/targets/5.14-rhel9.0.target
 lustre/kernel_patches/targets/4.18-rhel8.8.target
diff --git a/lustre/kernel_patches/targets/5.14-rhel9.2.target.in b/lustre/kernel_patches/targets/5.14-rhel9.2.target.in
new file mode 100644
index 0000000..fde75ee
--- /dev/null
+++ b/lustre/kernel_patches/targets/5.14-rhel9.2.target.in
@@ -0,0 +1,26 @@
+lnxmaj="5.14.0"
+lnxrel="284.11.1.el9_2"
+
+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