From f6d1840319b0abfd2d5a7b9099d7851a0ff05829 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 17 Feb 2023 15:55:53 -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. Lustre-change: https://review.whamcloud.com/48938 Lustre-commit: a05d02ea0e43bc656b0c25b8cd821323857e6cc2 Test-Parameters: trivial clientdistro=el9.1 testlist=sanity Test-Parameters: serverdistro=el8.7 clientdistro=el9.1 testlist=sanity Change-Id: Ied1bb5a3015e7cbb9156a0ccd748fd8c3069da37 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50060 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.1.target.in | 26 ++++++++++++++++++++++ 4 files changed, 29 insertions(+) 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 f448e03..3c4f58b 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -193,6 +193,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 9a91d4d..9013c11 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -44,6 +44,7 @@ 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.12.1.el9 (RHEL9.1) 4.4.120-92.70 (SLES12 SP2) 4.4.180-94.100 (SLES12 SP3) 4.4.0-131 (Ubuntu 16.04) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index c123787..d7c3711 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3370,6 +3370,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