From 9eb87e7ef3a144efc4fe81628352f1ca7f467018 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 13 Nov 2023 09:03:02 -0800 Subject: [PATCH] LU-17274 kernel: new kernel [RHEL 9.3 5.14.0-362.8.1.el9_3] This patch makes changes to support new RHEL 9.3 release for Lustre client. Test-Parameters: trivial env=SANITY_EXCEPT="906" \ mdtcount=4 mdscount=2 clientdistro=el9.3 testlist=sanity Test-Parameters: optional clientdistro=el9.3 testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.3 testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.3 testgroup=full-part-3 Change-Id: I9cce1a7d2249cb4df39106c44ba4417411ee0757 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53054 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 3 ++- lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.3.target.in | 26 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.3.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index d83eb8b..3261a47 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -209,6 +209,7 @@ autodetect_target() { rhel-9.0) target="5.14-rhel9.0";; rhel-9.1) target="5.14-rhel9.1";; rhel-9.2) target="5.14-rhel9.2";; + rhel-9.3) target="5.14-rhel9.3";; 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 935e420..519ef59 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -33,8 +33,8 @@ TBD Whamcloud 5.10.0-153.19.0.95.oe2203sp2 (openEuler 22.03 LTS SP2) * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary kernels built and tested during release cycle: + 5.14.0-362.8.1.el9 (RHEL9.3) 5.14.0-284.30.1.el9 (RHEL9.2) - 5.14.0-162.23.1.el9 (RHEL9.1) 4.18.0-477.27.1.el8 (RHEL8.8) 5.4.0-37 (Ubuntu 20.04) 5.14.21-150500.55.22 (SLES15 SP5) @@ -55,6 +55,7 @@ TBD Whamcloud 4.18.0-372.32.1.el8 (RHEL8.6) 4.18.0-425.10.1.el8 (RHEL8.7) 5.14.0-70.30.1.el9 (RHEL9.0) + 5.14.0-162.23.1.el9 (RHEL9.1) 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 32a423e..51aa24f 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -5039,6 +5039,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/5.14-rhel9.3.target 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 diff --git a/lustre/kernel_patches/targets/5.14-rhel9.3.target.in b/lustre/kernel_patches/targets/5.14-rhel9.3.target.in new file mode 100644 index 0000000..443fa29 --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.3.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="362.8.1.el9_3" + +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