From 2151156020d4ea3995d9b8e118ebb62fc7fc339e Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 15 Nov 2021 11:12:16 -0800 Subject: [PATCH] LU-15126 kernel: new kernel [RHEL 8.5 4.18.0-348.2.1.el8_5] This patch makes changes to support new RHEL 8.5 release for Lustre client. Test-Parameters: trivial clientdistro=el8.5 Lustre-change: https://review.whamcloud.com/45285 Lustre-commit: TBD (from a1b4ee323ad650d2fdff3754596771dd0c8df507) Change-Id: I068f091817126fffc14402254f45dcd75ba7f3fc Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/45528 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/4.18-rhel8.5.target.in | 26 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 lustre/kernel_patches/targets/4.18-rhel8.5.target.in diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 7b23e67..b1fc0f0 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -36,6 +36,7 @@ 4.18.0-193.28.1.el8 (RHEL8.2) 4.18.0-240.22.1.el8 (RHEL8.3) 4.18.0-305.19.1.el8 (RHEL8.4) + 4.18.0-348.2.1.el8 (RHEL8.5) 4.4.120-92.70 (SLES12 SP2) 4.4.0-142 (Ubuntu 16.04) vanilla linux 4.15.0 (ZFS only) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 11f2424..3aac4cb 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3810,6 +3810,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/4.18-rhel8.5.target lustre/kernel_patches/targets/4.18-rhel8.4.target lustre/kernel_patches/targets/4.18-rhel8.3.target lustre/kernel_patches/targets/4.18-rhel8.2.target diff --git a/lustre/kernel_patches/targets/4.18-rhel8.5.target.in b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in new file mode 100644 index 0000000..9ff6013 --- /dev/null +++ b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in @@ -0,0 +1,26 @@ +lnxmaj="4.18.0" +lnxrel="348.2.1.el8_5" + +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