LU-17109 kernel: new kernel [SLES15 SP5 5.14.21-150500.55.22.1]

This patch makes changes to support new SLES15 SP5 release
with kernel 5.14.21-150500.55.22.1 for Lustre client.

Test-Parameters: trivial clientdistro=sles15sp5 testlist=sanity
Test-Parameters: trivial clientdistro=sles15sp4 testlist=sanity

Change-Id: I278017a5c996a8cf4e3d604aa928e968ca007312
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52340
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh
index 78389a5..d83eb8b 100644 (file)
--- a/contrib/lbuild/funcs.sh
+++ b/contrib/lbuild/funcs.sh
@@ -220,6 +220,7 @@ autodetect_target() {
         sles15.2) target="$(uname -r | cut -d . -f 1,2)-sles15sp2";;
         sles15.3) target="$(uname -r | cut -d . -f 1,2)-sles15sp3";;
        sles15.4) target="$(uname -r | cut -d . -f 1,2)-sles15sp4";;
+       sles15.5) target="$(uname -r | cut -d . -f 1,2)-sles15sp5";;
           fc18)   target="3.x-fc18";;
          oe2203) target="5.10-oe2203";;
        oe2203.sp1) target="5.10-oe2203sp1";;

diff --git a/contrib/lbuild/lbuild-sles15 b/contrib/lbuild/lbuild-sles15
index 8d79727..2bc2df8 100644 (file)
--- a/contrib/lbuild/lbuild-sles15
+++ b/contrib/lbuild/lbuild-sles15
@@ -12,31 +12,53 @@ SUSE_MACROS=/usr/lib/rpm/macros.d/macros.kernel-source
 
 source ${LBUILD_DIR}/lbuild-sles
 
-kernel_srpm_location() {
-    local site
-    local kdir
+get_distro_kdir() {
+       local distro
+       local kdir
+
+       case $lnxmaj in
+       4.12)
+               distro=sles15.1
+               kdir=updates-sles15.1-src
+               ;;
+       5.3)
+               case ${lnxrel%%.*} in
+               24)
+                       distro=sles15.2
+                       kdir=updates-sles15.2-src
+                       ;;
+               59|150300)
+                       distro=sles15.3
+                       kdir=updates-sles15.3-src
+                       ;;
+               esac
+               ;;
+       5.14)
+               case ${lnxrel%%.*} in
+               150400)
+                       distro=sles15.4
+                       kdir=updates-sles15.4-src
+                       ;;
+               150500)
+                       distro=sles15.5
+                       kdir=updates-sles15.5-src
+                       ;;
+               esac
+               ;;
+       esac
+
+       case $1 in
+       distro) echo -n $distro;;
+       kdir)   echo -n $kdir;;
+       esac
+}
 
-    case $lnxmaj in
-    4.12)
-        kdir=updates-sles15.1-src
-        ;;
-    5.3)
-        case ${lnxrel%%.*} in
-        24)
-            kdir=updates-sles15.2-src
-            ;;
-        59)
-            kdir=updates-sles15.3-src
-            ;;
-        esac
-        ;;
-    5.14)
-        kdir=updates-sles15.4-src
-        ;;
-    esac
+kernel_srpm_location() {
+       local site
+       local kdir=$(get_distro_kdir kdir)
 
-    site="http://mgmt/cobbler/repo_mirror/$kdir"
-    echo "$site/src/"
+       site="http://mgmt/cobbler/repo_mirror/$kdir"
+       echo "$site/src/"
 }
 
 edit_specs() {
@@ -133,7 +155,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 distro=$(get_distro_kdir distro)
     local base_site
     local base_dir
     local dev_site
@@ -143,25 +165,6 @@ find_linux_rpm-sles15() {
         wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}"
     fi
 
-    case $lnxmaj in
-    4.12)
-        distro=sles15.1
-        ;;
-    5.3)
-        case ${lnxrel%%.*} in
-        24)
-            distro=sles15.2
-            ;;
-        59)
-            distro=sles15.3
-            ;;
-        esac
-        ;;
-    5.14)
-        distro=sles15.4
-        ;;
-    esac
-
     base_dir=updates-basesystem-$distro-x86_64
     dev_dir=updates-devtools-$distro-x86_64
 

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 532c66e..245e7b8 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,7 +37,7 @@ TBD Whamcloud
          5.14.0-162.23.1.el9  (RHEL9.1)
          4.18.0-477.21.1.el8  (RHEL8.8)
          5.4.0-37             (Ubuntu 20.04)
-         5.14.21-150400.24.46 (SLES15 SP4)
+         5.14.21-150500.55.22 (SLES15 SP5)
        * Other clients known to build on these kernels at some point (others may also work):
          3.10.0-862.14.4.el7  (RHEL7.5)
          3.10.0-957.27.2.el7  (RHEL7.6)
@@ -62,6 +62,7 @@ TBD Whamcloud
          4.12.14-197.75       (SLES15 SP1)
          5.3.18-24.96         (SLES15 SP2)
          5.3.18-150300.59.93  (SLES15 SP3)
+         5.14.21-150400.24.46 (SLES15 SP4)
          4.4.0-131            (Ubuntu 16.04)
          4.15.0-48            (Ubuntu 18.04)
          5.8.0-53             (Ubuntu 20.04.2 HWE)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index f9bac5c..b6e673d 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -4960,6 +4960,7 @@ lustre/kernel_patches/targets/4.12-sles15sp1.target
 lustre/kernel_patches/targets/5.3-sles15sp2.target
 lustre/kernel_patches/targets/5.3-sles15sp3.target
 lustre/kernel_patches/targets/5.14-sles15sp4.target
+lustre/kernel_patches/targets/5.14-sles15sp5.target
 lustre/kernel_patches/targets/3.x-fc18.target
 lustre/kernel_patches/targets/5.10-oe2203.target
 lustre/kernel_patches/targets/5.10-oe2203sp1.target

diff --git a/lustre/kernel_patches/targets/5.14-sles15sp5.target.in b/lustre/kernel_patches/targets/5.14-sles15sp5.target.in
new file mode 100644 (file)
index 0000000..728b542
--- /dev/null
+++ b/lustre/kernel_patches/targets/5.14-sles15sp5.target.in
@@ -0,0 +1,37 @@
+lnxmaj="5.14"
+lnxmin=".21"
+lnxrel="150500.55.22"
+# 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