From 58d153994ddac96fa15fb33ad32a67a89f9f7b97 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 1 Dec 2021 09:58:21 -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 env=SANITY_EXCEPT="101j" \ clientdistro=el8.5 Lustre-change: https://review.whamcloud.com/45285 Lustre-commit: 951f31789f76295d182f56bef1fa8d92f69e7e2a Change-Id: I068f091817126fffc14402254f45dcd75ba7f3fc Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/45542 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger --- lipe/detect-distro.sh | 2 +- lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/4.18-rhel8.5.target.in | 26 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 lustre/kernel_patches/targets/4.18-rhel8.5.target.in diff --git a/lipe/detect-distro.sh b/lipe/detect-distro.sh index 154c0d2..a2e1fd4 100755 --- a/lipe/detect-distro.sh +++ b/lipe/detect-distro.sh @@ -19,7 +19,7 @@ if which lsb_release >/dev/null 2>&1; then "EnterpriseEnterpriseServer") name="oel" ;; - "RedHatEnterprise*" | "ScientificSL" | "CentOS") + RedHatEnterprise* | "ScientificSL" | "CentOS") name="rhel" ;; "SUSE LINUX") diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 678dc37..693b69e 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -35,6 +35,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.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 3c1c502..c67976a 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2905,6 +2905,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