From 0a900c5b4a28c4c63055dde00c7b91e39c4912a0 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Sun, 5 Sep 2021 19:19:07 -0700 Subject: [PATCH] LU-14782 kernel: new kernel [SLES15 SP3 5.3.18-59.19.1] This patch makes changes to support new SLES15 SP3 release with kernel 5.3.18-59.19.1 for Lustre client. Test-Parameters: trivial Change-Id: Idf6fad9773dd242c02859a5c7b14401675c4ecf4 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/44062 Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.3-sles15sp3.target.in | 37 ++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 lustre/kernel_patches/targets/5.3-sles15sp3.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 5f729ef..22b115d 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -201,6 +201,7 @@ autodetect_target() { sles12*) target="$(uname -r | cut -d . -f 1,2)-sles12";; sles15.1) target="$(uname -r | cut -d . -f 1,2)-sles15sp1";; sles15.2) target="$(uname -r | cut -d . -f 1,2)-sles15sp2";; + sles15.3) target="$(uname -r | cut -d . -f 1,2)-sles15sp3";; fc18) target="3.x-fc18";; *) fatal 1 "I don't know what distro $distro is.\nEither update autodetect_target() or use the --target argument.";; esac diff --git a/lustre/ChangeLog b/lustre/ChangeLog index fde2dcd..93c67d6 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -31,6 +31,7 @@ TBD Whamcloud 4.12.14-122.83 (SLES12 SP5) 4.12.14-197.75 (SLES15 SP1) 5.3.18-24.61 (SLES15 SP2) + 5.3.18-59.19 (SLES15 SP3) 4.15.0-48 (Ubuntu 18.04) * Other clients known to build on these kernels at some point (others may also work): 3.10.0-862.14.4.el7 (RHEL7.5) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 99d4365..026f650 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2986,6 +2986,7 @@ lustre/kernel_patches/targets/4.12-sles12sp4.target lustre/kernel_patches/targets/4.12-sles12sp5.target lustre/kernel_patches/targets/4.12-sles15sp1.target lustre/kernel_patches/targets/4.12-sles15sp2.target +lustre/kernel_patches/targets/5.3-sles15sp3.target lustre/kernel_patches/targets/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile diff --git a/lustre/kernel_patches/targets/5.3-sles15sp3.target.in b/lustre/kernel_patches/targets/5.3-sles15sp3.target.in new file mode 100644 index 0000000..0c436de --- /dev/null +++ b/lustre/kernel_patches/targets/5.3-sles15sp3.target.in @@ -0,0 +1,37 @@ +lnxmaj="5.3" +lnxmin=".18" +lnxrel="59.19" +# use this when there is an "RPM fix" which means that the name of the +# (source) RPM has been updated but the version of the kernel inside the +# RPM is not also updated +rpmfix=".1" + +# this is the delimeter that goes before the "smp" at the end of the version +# defaults to empty +FLAVOR_DELIMITER="-" + +KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm +SERIES="" +VERSION=$lnxmaj +EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@" +LUSTRE_VERSION=@VERSION@ + +OFED_VERSION=inkernel + +BASE_ARCHS="i686 ppc x86_64 ia64 ppc64" +BIGMEM_ARCHS="" +BOOT_ARCHS="" +JENSEN_ARCHS="" +DEFAULT_ARCHS="i686 x86_64 ia64 ppc64" +BIGSMP_ARCHS="" +PSERIES64_ARCHS="ppc" +UP_ARCHS="" +SRC_ARCHS="" +#RPMSMPTYPE="smp" + +for cc in gcc ; do + if which $cc >/dev/null 2>/dev/null ; then + export CC=$cc + break + fi +done -- 1.8.3.1