From 2a9d84a7ebcc1d9264fae8c191306b4341129d7c Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 21 Dec 2017 15:14:05 -0800 Subject: [PATCH] LU-10427 kernel: kernel update [SLES12 SP2 4.4.103-92.53] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \ mdsdistro=sles12sp2 ossdistro=sles12sp2 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I065ab670ad58fda19610e14440e1c304d0eae74f Reviewed-on: https://review.whamcloud.com/30652 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: John L. Hammond --- contrib/lbuild/lbuild-sles12 | 32 ++++++++++++++++++---- lustre/ChangeLog | 4 +-- .../kernel-4.4-4.4-sles12-x86_64.config | 7 +++-- lustre/kernel_patches/targets/4.4-sles12.target.in | 4 +-- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index e76188d..6a21843 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -14,16 +14,26 @@ source ${LBUILD_DIR}/lbuild-sles kernel_srpm_location() { local site + local kminor + local kdir case $lnxmaj in 3.12) site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-src" ;; 4.4) - site="http://mgmt/cobbler/repo_mirror/updates-sles12.2-src" - if [ ${lnxmin##.} -eq 82 -o ${lnxmin##.} -gt 91 ] + kminor=${lnxmin##.} + kdir=updates-sles12.2-src + if [ $kminor -eq 103 ] then - site="http://mgmt/cobbler/repo_mirror/updates-sles12.3-src" + if [ ${lnxrel%%.*} -lt 90 ] + then + kdir=updates-sles12.3-src + fi + elif [ $kminor -eq 82 -o $kminor -gt 91 ] + then + kdir=updates-sles12.3-src fi + site="http://mgmt/cobbler/repo_mirror/$kdir" ;; esac echo "$site/src/" @@ -141,16 +151,26 @@ find_linux_rpm-sles12() { wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}" fi local site + local kminor + local kdir case $lnxmaj in 3.12) site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-x86_64" ;; 4.4) - site="http://mgmt/cobbler/repo_mirror/updates-sles12.2-x86_64" - if [ ${lnxmin##.} -eq 82 -o ${lnxmin##.} -gt 91 ] + kminor=${lnxmin##.} + kdir=updates-sles12.2-x86_64 + if [ $kminor -eq 103 ] + then + if [ ${lnxrel%%.*} -lt 90 ] + then + kdir=updates-sles12.3-x86_64 + fi + elif [ $kminor -eq 82 -o $kminor -gt 91 ] then - site="http://mgmt/cobbler/repo_mirror/updates-sles12.3-x86_64" + kdir=updates-sles12.3-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 988deae..b6ca9e0 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,7 +12,7 @@ 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.90-92.45 (SLES12 SP2) + 4.4.103-92.53 (SLES12 SP2) 4.4.103-6.33 (SLES12 SP3) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: @@ -25,7 +25,7 @@ 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.90-92.45 (SLES12 SP2) + 4.4.103-92.53 (SLES12 SP2) 4.4.103-6.33 (SLES12 SP3) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config index 51c69db..4449bd9 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.90 Kernel Configuration +# Linux/x86 4.4.103 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-92.45-default" +CONFIG_LOCALVERSION="-92.53-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -823,7 +823,6 @@ CONFIG_IA32_AOUT=m CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_VMD=y @@ -6443,6 +6442,7 @@ CONFIG_HAVE_ARCH_KASAN=y # CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set @@ -6637,6 +6637,7 @@ CONFIG_OPTIMIZE_INLINING=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=y diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index 64909c7..ae99fcf 100644 --- a/lustre/kernel_patches/targets/4.4-sles12.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12.target.in @@ -1,6 +1,6 @@ lnxmaj="4.4" -lnxmin=".90" -lnxrel="92.45" +lnxmin=".103" +lnxrel="92.53" # 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 diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 13be9f8..4a4e963 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -22,7 +22,7 @@ PATCH SERIES FOR SERVER KERNELS: 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-107 (SLES11 SP4) 3.12-sles12.series 3.12.74-60.64.40 (SLES12 SP1) -4.4-sles12.series 4.4.90-92.45 (SLES12 SP2) +4.4-sles12.series 4.4.103-92.53 (SLES12 SP2) 4.4-sles12sp3.series 4.4.103-6.33 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1