From: Jian Yu Date: Mon, 18 Nov 2024 07:41:16 +0000 (-0800) Subject: LU-18387 kernel: new kernel [RHEL 9.5 5.14.0-503.14.1.el9_5] X-Git-Tag: 2.16.51~144 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F56748%2F6;p=fs%2Flustre-release.git LU-18387 kernel: new kernel [RHEL 9.5 5.14.0-503.14.1.el9_5] This patch makes changes to support new RHEL 9.5 release for Lustre client. Test-Parameters: trivial \ mdtcount=4 mdscount=2 clientdistro=el9.5 testlist=sanity Test-Parameters: optional clientdistro=el9.5 testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.5 testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.5 testgroup=full-part-3 Change-Id: I1bce12b2b7190bcbd880916049667630aba700c8 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56748 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 6453a46..e33f4be 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -211,6 +211,7 @@ autodetect_target() { rhel-9.2) target="5.14-rhel9.2";; rhel-9.3) target="5.14-rhel9.3";; rhel-9.4) target="5.14-rhel9.4";; + rhel-9.5) target="5.14-rhel9.5";; 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 9a6b9ce..5ffacb3 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -42,12 +42,14 @@ 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-503.14.1.el9 (RHEL9.5) 5.14.0-427.31.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) 4.18.0-553.16.1.el8 (RHEL8.10) 4.18.0-513.24.1.el8 (RHEL8.9) 4.18.0-477.27.1.el8 (RHEL8.8) - 5.4.0-37 (Ubuntu 20.04) + 5.15.0-88 (Ubuntu 22.04) + 6.8.0-35 (Ubuntu 24.04) 6.4.0-150600.23.17 (SLES15 SP6) 5.14.21-150500.55.73 (SLES15 SP5) * Other clients known to build on these kernels at some point (others may also work): @@ -79,6 +81,7 @@ TBD Whamcloud 5.14.21-150400.24.100 (SLES15 SP4) 4.4.0-131 (Ubuntu 16.04) 4.15.0-48 (Ubuntu 18.04) + 5.4.0-37 (Ubuntu 20.04) 5.8.0-53 (Ubuntu 20.04.2 HWE) 5.11.0-31 (Ubuntu 20.04.3 HWE) 5.11.0 (vanilla kernel.org) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 794dfba..f201ffd 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -5750,6 +5750,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +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 lustre/kernel_patches/targets/5.14-rhel9.2.target diff --git a/lustre/kernel_patches/targets/5.14-rhel9.5.target.in b/lustre/kernel_patches/targets/5.14-rhel9.5.target.in new file mode 100644 index 0000000..07f305c --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.5.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="503.14.1.el9_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