From dc2a6f4b0a36ca2a745e52b02fdcb73bd8d052ec Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 20 May 2020 16:03:04 -0700 Subject: [PATCH] LU-13111 kernel: new kernel [SLES12 SP5 4.12.14-122.20.1] This patch makes changes to support new SLES12 SP5 release for Lustre client. Test-Parameters: trivial clientdistro=sles12sp5 \ env=SANITY_EXCEPT="56oc 817" testlist=sanity Change-Id: Ia4b856b03801e02da9a2e584efeb8759b4dd30c3 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/38628 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/funcs.sh | 1 + contrib/lbuild/lbuild-sles12 | 7 +++- lustre/ChangeLog | 1 + lustre/autoconf/lustre-core.m4 | 1 + .../targets/4.12-sles12sp5.target.in | 37 ++++++++++++++++++++++ 5 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 lustre/kernel_patches/targets/4.12-sles12sp5.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 698a55f..3dd269f 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -195,6 +195,7 @@ autodetect_target() { 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";; + sles12.5) target="$(uname -r | cut -d . -f 1,2)-sles12sp5";; sles12.4) target="$(uname -r | cut -d . -f 1,2)-sles12sp4";; sles12.3) target="$(uname -r | cut -d . -f 1,2)-sles12sp3";; sles12*) target="$(uname -r | cut -d . -f 1,2)-sles12";; diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index 996bb43..9233bab 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -185,7 +185,12 @@ find_linux_rpm-sles12() { site="http://mgmt/cobbler/repo_mirror/$kdir" ;; 4.12) - site="http://mgmt/cobbler/repo_mirror/updates-sles12.4-x86_64" + kdir=updates-sles12.4-x86_64 + if [ ${lnxrel%%.*} -ge 120 ] + then + kdir=updates-sles12.5-x86_64 + fi + site="http://mgmt/cobbler/repo_mirror/$kdir" ;; esac if [ ! -f $pathtorpms/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm ]; then diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 7129ef2..6041a89 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -20,6 +20,7 @@ TBD Whamcloud 3.10.0-1062.18.1.el7 (RHEL7.7) 3.10.0-1127.el7 (RHEL7.8) 4.12.14-95.45 (SLES12 SP4) + 4.12.14-122.20 (SLES12 SP5) 4.12.14-197.37 (SLES15 SP1) 4.15.0-48 (Ubuntu 18.04) * Other clients known to build on unpatched kernels at some point (others may also work): diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 436737b..e8e17d7 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2793,6 +2793,7 @@ lustre/kernel_patches/targets/3.10-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.6.target 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/3.x-fc18.target lustre/ldlm/Makefile diff --git a/lustre/kernel_patches/targets/4.12-sles12sp5.target.in b/lustre/kernel_patches/targets/4.12-sles12sp5.target.in new file mode 100644 index 0000000..b8891f3 --- /dev/null +++ b/lustre/kernel_patches/targets/4.12-sles12sp5.target.in @@ -0,0 +1,37 @@ +lnxmaj="4.12" +lnxmin=".14" +lnxrel="122.20" +# 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