From a05d02ea0e43bc656b0c25b8cd821323857e6cc2 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 27 Jan 2023 12:34:11 -0800 Subject: [PATCH] LU-16221 kernel: new kernel [RHEL 9.1 5.14.0-162.12.1.el9_1] This patch makes changes to support new RHEL 9.1 release for Lustre client. Test-Parameters: trivial clientdistro=el9.1 \ env=SANITY_EXCEPT="130 244a" testlist=sanity Change-Id: I8af730f84c9ddf9dcb7e3ddfbd24a68173f51e8d Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/48938 Tested-by: Maloo Tested-by: jenkins Reviewed-by: Oleg Drokin Reviewed-by: Shaun Tancheff Reviewed-by: Yang Sheng --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 5 +++-- lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.1.target.in | 26 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.1.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 949beeb..0a1f588 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -198,6 +198,7 @@ autodetect_target() { rhel7*) target="3.10-rhel7";; rhel8*) target="4.18-rhel8";; rhel-9.0) target="5.14-rhel9.0";; + rhel-9.1) target="5.14-rhel9.1";; 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 de63f6f..8ecb104 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -27,7 +27,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-70.30.1.el9 (RHEL9.0) + 5.14.0-162.12.1.el9 (RHEL9.1) 4.18.0-425.3.1.el8 (RHEL8.7) 5.4.0-37 (Ubuntu 20.04) 5.14.21-150400.24.28 (SLES15 SP4) @@ -46,6 +46,7 @@ TBD Whamcloud 4.18.0-305.25.1.el8 (RHEL8.4) 4.18.0-348.23.1.el8 (RHEL8.5) 4.18.0-372.32.1.el8 (RHEL8.6) + 5.14.0-70.30.1.el9 (RHEL9.0) 4.4.120-92.70 (SLES12 SP2) 4.4.180-94.100 (SLES12 SP3) 4.12.14-95.48 (SLES12 SP4) @@ -59,7 +60,7 @@ TBD Whamcloud 5.11.0-31 (Ubuntu 20.04.3 HWE) 5.11.0 (vanilla kernel.org) 5.10.0-60.56.0.84.oe2203 (openEuler 22.03 LTS) - * Recommended e2fsprogs version: 1.46.5.wc1 or newer + * Recommended e2fsprogs version: 1.46.6-wc1 or newer * Recommended ZFS version: 2.1.5 * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 031d293..0f73072 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3986,6 +3986,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +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.7.target lustre/kernel_patches/targets/4.18-rhel8.6.target diff --git a/lustre/kernel_patches/targets/5.14-rhel9.1.target.in b/lustre/kernel_patches/targets/5.14-rhel9.1.target.in new file mode 100644 index 0000000..2b60a69 --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.1.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="162.12.1.el9_1" + +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