From c476c2a103219845ff69c5535d9a6a0832b410c1 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 25 Apr 2023 18:29:20 -0700 Subject: [PATCH] LU-16756 kernel: new kernel [RHEL 9.2 5.14.0-283.el9] 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 101j" clientdistro=el9.2 testlist=sanity Change-Id: I4886bbf30d6d6a93c4adbfb68871e9d91f5b64de Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50752 Reviewed-by: Oleg Drokin Reviewed-by: Yang Sheng Tested-by: Maloo Tested-by: jenkins --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.2.target.in | 26 ++++++++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.2.target.in 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 639f705..a74e389 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -28,6 +28,7 @@ TBD Whamcloud 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: + 5.14.0-283.el9 (RHEL9.2) 5.14.0-162.18.1.el9 (RHEL9.1) 4.18.0-477.el8 (RHEL8.8) 5.4.0-37 (Ubuntu 20.04) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 02844e5..524645f 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3431,6 +3431,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..582fc85 --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.2.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="283.el9" + +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