LU-15154 kernel: kernel update SLES15 SP3 [5.3.18-59.27.1]

Update SLES15 SP3 kernel to 5.3.18-59.27.1 for Lustre client.

Test-Parameters: trivial

Change-Id: Ie3c369a8e93a75b4afbde55489bd3819bb39e1de
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45349
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/lbuild-sles15 b/contrib/lbuild/lbuild-sles15
index e2afcfb..8a67932 100644 (file)
--- a/contrib/lbuild/lbuild-sles15
+++ b/contrib/lbuild/lbuild-sles15
@@ -20,7 +20,14 @@ kernel_srpm_location() {
         kdir=updates-sles15.1-src
         ;;
     5.3)
-        kdir=updates-sles15.2-src
+        case ${lnxrel%%.*} in
+        24)
+            kdir=updates-sles15.2-src
+            ;;
+        59)
+            kdir=updates-sles15.3-src
+            ;;
+        esac
         ;;
     esac
 
@@ -122,6 +129,7 @@ find_linux_rpm-sles15() {
     local wanted_kernel="$2"
     local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"}
     local wanted_kernel_org="$wanted_kernel"
+    local distro
     local base_site
     local base_dir
     local dev_site
@@ -133,15 +141,23 @@ find_linux_rpm-sles15() {
 
     case $lnxmaj in
     4.12)
-        base_dir=updates-basesystem-sles15.1-x86_64
-        dev_dir=updates-devtools-sles15.1-x86_64
+        distro=sles15.1
         ;;
     5.3)
-        base_dir=updates-basesystem-sles15.2-x86_64
-        dev_dir=updates-devtools-sles15.2-x86_64
+        case ${lnxrel%%.*} in
+        24)
+            distro=sles15.2
+            ;;
+        59)
+            distro=sles15.3
+            ;;
+        esac
         ;;
     esac
 
+    base_dir=updates-basesystem-$distro-x86_64
+    dev_dir=updates-devtools-$distro-x86_64
+
     base_site="http://mgmt/cobbler/repo_mirror/$base_dir"
     dev_site="http://mgmt/cobbler/repo_mirror/$dev_dir"
 

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c140b98..cc1cd20 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -31,7 +31,7 @@ TBD Whamcloud
          4.12.14-122.91       (SLES12 SP5)
          4.12.14-197.75       (SLES15 SP1)
          5.3.18-24.61         (SLES15 SP2)
-         5.3.18-59.19         (SLES15 SP3)
+         5.3.18-59.27         (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/kernel_patches/targets/5.3-sles15sp3.target.in b/lustre/kernel_patches/targets/5.3-sles15sp3.target.in
index 0c436de..2786125 100644 (file)
--- a/lustre/kernel_patches/targets/5.3-sles15sp3.target.in
+++ b/lustre/kernel_patches/targets/5.3-sles15sp3.target.in
@@ -1,6 +1,6 @@
 lnxmaj="5.3"
 lnxmin=".18"
-lnxrel="59.19"
+lnxrel="59.27"
 # 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