From ef4a569865bbeb45219fd48a45af5980c94cb879 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Fri, 5 May 2017 15:14:02 -0700 Subject: [PATCH] LU-9459 kernel: kernel update [SLES12 SP2 4.4.59-92.17] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \ mdsdistro=sles12sp2 ossdistro=sles12sp2 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Change-Id: I3b47a8c3a6f0f6c6f63dba97be769ab653fc6cb6 Signed-off-by: Bob Glossman Reviewed-on: https://review.whamcloud.com/27095 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-sles12 | 12 ++++++++---- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12-x86_64.config | 5 ++--- lustre/kernel_patches/targets/4.4-sles12.target.in | 10 +++++++--- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index 57febcc..091d6e4 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -131,7 +131,11 @@ find_linux_rpm-sles12() { local prefix="$1" local wanted_kernel="$2" local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"} + local wanted_kernel_org="$wanted_kernel" + if [ "x$rpmfix_diff" != "x" ] && [ $wanted_kernel != "${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}" ]; then + wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}" + fi local site case $lnxmaj in 3.12) @@ -145,12 +149,12 @@ find_linux_rpm-sles12() { fetch_url "$site/x86_64/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms fi # SLES 12 also needs kernel-devel in addition to kernel-default-devel - if [ ! -f $pathtorpms/kernel-devel-$wanted_kernel.noarch.rpm ]; then - fetch_url "$site/noarch/kernel-devel-$wanted_kernel.noarch.rpm" $pathtorpms + if [ ! -f $pathtorpms/kernel-devel-$wanted_kernel_org.noarch.rpm ]; then + fetch_url "$site/noarch/kernel-devel-$wanted_kernel_org.noarch.rpm" $pathtorpms fi # SLES also needs the kernel-source along with kernel-devel - if [ ! -f $pathtorpms/kernel-source-$wanted_kernel.noarch.rpm ]; then - fetch_url "$site/noarch/kernel-source-$wanted_kernel.noarch.rpm" $pathtorpms + if [ ! -f $pathtorpms/kernel-source-$wanted_kernel_org.noarch.rpm ]; then + fetch_url "$site/noarch/kernel-source-$wanted_kernel_org.noarch.rpm" $pathtorpms fi echo "kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" diff --git a/lustre/ChangeLog b/lustre/ChangeLog index e9b1f69..4482e46 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,7 +12,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-97 (SLES11 SP4) 3.12.69-60.64.35 (SLES12 SP1) - 4.4.49-92.14 (SLES12 SP2) + 4.4.59-92.17 (SLES12 SP2) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -24,7 +24,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-97 (SLES11 SP4) 3.12.69-60.64.35 (SLES12 SP1) - 4.4.49-92.14 (SLES12 SP2) + 4.4.59-92.17 (SLES12 SP2) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.6.5.9 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 b40259a..520a28e 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.49 Kernel Configuration +# Linux/x86 4.4.59 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.14-default" +CONFIG_LOCALVERSION="-92.17-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -1403,7 +1403,6 @@ CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index 24334a1..d33547d 100644 --- a/lustre/kernel_patches/targets/4.4-sles12.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12.target.in @@ -1,10 +1,14 @@ lnxmaj="4.4" -lnxmin=".49" -lnxrel="92.14" +lnxmin=".59" +lnxrel="92.17" # 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" +rpmfix=".2" +# for some oddly reasons (bug??) -devel and source have different fix +# so we'll add another one to detect this, make it the same or remove +# this change they fix the bug +rpmfix_diff=".3" # this is the delimeter that goes before the "smp" at the end of the version # defaults to empty diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 7ebf851..dfd919c 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -22,6 +22,6 @@ PATCH SERIES FOR SERVER KERNELS: 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-97 (SLES11 SP4) 3.12-sles12.series 3.12.69-60.64.35 (SLES12 SP1) -4.4-sles12.series 4.4.49-92.14 (SLES12 SP2) +4.4-sles12.series 4.4.59-92.17 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1