From 4884e8597393629b429364d818c8004548c25347 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 13 May 2025 17:25:08 -0700 Subject: [PATCH] LU-18668 kernel: new kernel [RHEL 9.6 5.14.0-570.16.1.el9_6] This patch makes changes to support new RHEL 9.6 release for Lustre client. Test-Parameters: trivial env=SANITY_EXCEPT="17p" \ mdtcount=4 mdscount=2 clientdistro=el9.6 testlist=sanity Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-3 Change-Id: Idf8c96ee9389978d9497da73b05c5ed400c429d4 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57876 Tested-by: Maloo Tested-by: jenkins Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger --- config/lustre-core.m4 | 1 + contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 1 + .../kernel_patches/targets/5.14-rhel9.6.target.in | 26 ++++++++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.6.target.in diff --git a/config/lustre-core.m4 b/config/lustre-core.m4 index 5300afa..f639aad 100644 --- a/config/lustre-core.m4 +++ b/config/lustre-core.m4 @@ -6132,6 +6132,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/5.14-rhel9.6.target lustre/kernel_patches/targets/5.14-rhel9.5.target lustre/kernel_patches/targets/5.14-rhel9.4.target lustre/kernel_patches/targets/5.14-rhel9.3.target diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index e33f4be..92574c36 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -212,6 +212,7 @@ autodetect_target() { rhel-9.3) target="5.14-rhel9.3";; rhel-9.4) target="5.14-rhel9.4";; rhel-9.5) target="5.14-rhel9.5";; + rhel-9.6) target="5.14-rhel9.6";; 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 7f47c27..e9c9b34 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -43,6 +43,7 @@ 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-570.16.1.el9 (RHEL9.6) 5.14.0-503.40.1.el9 (RHEL9.5) 5.14.0-427.42.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) diff --git a/lustre/kernel_patches/targets/5.14-rhel9.6.target.in b/lustre/kernel_patches/targets/5.14-rhel9.6.target.in new file mode 100644 index 0000000..e19e98b --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.6.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="570.16.1.el9_6" + +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