From: Jian Yu Date: Mon, 11 Feb 2019 23:53:13 +0000 (-0800) Subject: LU-11927 kernel: new kernel [SLES12 SP4 4.12.14-95.6.1] X-Git-Tag: 2.12.52~35 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9dbbc720bd0bedb119c516a69323008df9cc3695;hp=be6de3db9cace327b3d34870417c96c2ac705313 LU-11927 kernel: new kernel [SLES12 SP4 4.12.14-95.6.1] This patch makes changes to support new SLES12 SP4 release for Lustre client. Test-Parameters: trivial clientdistro=sles12sp4 \ envdefinitions=LNET_SELFTEST_EXCEPT=smoke,SANITY_EXCEPT=103a Change-Id: Ibe59ebc30c25f2cab771ac4c2c9b7a9b974732d5 Signed-off-by: Jian Yu Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/34191 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index cd1be96..88788ae 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -202,6 +202,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.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";; fc15) target="2.6-fc15";; diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index 8bc8b73..996bb43 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -184,6 +184,9 @@ find_linux_rpm-sles12() { fi site="http://mgmt/cobbler/repo_mirror/$kdir" ;; + 4.12) + site="http://mgmt/cobbler/repo_mirror/updates-sles12.4-x86_64" + ;; esac if [ ! -f $pathtorpms/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm ]; then fetch_url "$site/x86_64/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms diff --git a/lustre/ChangeLog b/lustre/ChangeLog index db62bd3..fdf16fe 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -21,6 +21,7 @@ TBD Whamcloud 4.14.0-115.2.2.el7a (RHEL7.6) 4.4.120-92.70 (SLES12 SP2) 4.4.162-94.69 (SLES12 SP3) + 4.12.14-95.6 (SLES12 SP4) 4.4.0-131 (Ubuntu 16.04) 4.15.0-32 (Ubuntu 18.04) vanilla linux 4.15.0 (ZFS only) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 18440ef..84412d0 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3609,6 +3609,7 @@ lustre/kernel_patches/targets/3.0-sles11sp4.target lustre/kernel_patches/targets/3.12-sles12.target lustre/kernel_patches/targets/4.4-sles12.target lustre/kernel_patches/targets/4.4-sles12sp3.target +lustre/kernel_patches/targets/4.12-sles12sp4.target lustre/kernel_patches/targets/2.6-fc11.target lustre/kernel_patches/targets/2.6-fc12.target lustre/kernel_patches/targets/2.6-fc15.target diff --git a/lustre/kernel_patches/targets/4.12-sles12sp4.target.in b/lustre/kernel_patches/targets/4.12-sles12sp4.target.in new file mode 100644 index 0000000..aff12fe --- /dev/null +++ b/lustre/kernel_patches/targets/4.12-sles12sp4.target.in @@ -0,0 +1,37 @@ +lnxmaj="4.12" +lnxmin=".14" +lnxrel="95.6" +# 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