LU-13488 kernel: RHEL 8.2 server support

[fs/lustre-release.git] / config / lustre-build-ldiskfs.m4

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 4b52570..56a43ef 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,6 +13,7 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
+       82)     LDISKFS_SERIES="4.18-rhel8.2.series"    ;;
        81)     LDISKFS_SERIES="4.18-rhel8.1.series"    ;;
        80)     LDISKFS_SERIES="4.18-rhel8.series"      ;;
        78)     LDISKFS_SERIES="3.10-rhel7.8.series"    ;;
@@ -21,24 +22,28 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        esac
 ], [test x$SUSE_KERNEL = xyes], [
        AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.18],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.12.14],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[],
-       [LDISKFS_SERIES="3.12-sles12.series"],[
-               PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
-               case $PLEV in
-               1) LDISKFS_SERIES="3.12-sles12sp1.series"
-                       ;;
-               *) LDISKFS_SERIES="3.12-sles12.series"
+       AS_VERSION_COMPARE([$LINUXRELEASE],[4.12.14],[], [], [
+               suse_conf=$LINUX_OBJ/include/generated/uapi/linux/suse_version.h
+               suse_vers=$(awk '[$]2 == "SUSE_VERSION" {print [$]3 }' $suse_conf)
+               suse_patchlevel=$(awk '[$]2 == "SUSE_PATCHLEVEL" {print [$]3 }' $suse_conf)
+               echo "$suse_conf $suse_vers $suse_patchlevel  ${suse_vers}sp$suse_patchlevel" >> /tmp/log-nb
+               case ${suse_vers}sp$suse_patchlevel in # (
+               15sp0 ) LDISKFS_SERIES="4.12-sles15.series"
+                       if test ! -f $LINUX/arch/x86/kernel/cpu/hygon.c ; then
+                               # This file was added shortly after -150.22 so
+                               # this must be 150.22 or earlier
+                               LDISKFS_SERIES="4.12-sles15-22.series"
+                       fi
+                       ;; # (
+               15sp1 ) LDISKFS_SERIES="4.12-sles15sp1.series"
+                       if test ! -f $LINUX/arch/x86/kernel/cpu/umwait.c ; then
+                               # This file was added after -197.7 so
+                               # this must be -197.7 or earlier
+                               LDISKFS_SERIES="4.12-sles15sp1-7.series"
+                       fi
                        ;;
                esac
-       ])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
-           [LDISKFS_SERIES="4.4-sles12sp2.series"]
-       )], [LDISKFS_SERIES="4.4-sles12sp3.series"],
-           [LDISKFS_SERIES="4.4-sles12sp3.series"]
-       )], [LDISKFS_SERIES="4.12-sles15.series"],
-           [LDISKFS_SERIES="4.12-sles15.series"]
+       ]
        )], [LDISKFS_SERIES="5.4.0-ml.series"],
            [LDISKFS_SERIES="5.4.0-ml.series"])
 ], [test x$UBUNTU_KERNEL = xyes], [
@@ -407,6 +412,10 @@ AC_MSG_RESULT([$enable_ldiskfs])
 AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
 ]) # LB_CONFIG_LDISKFS
 
+
+AC_DEFUN([LB_EXT4_SRC_DIR_SRC], [])
+AC_DEFUN([LB_EXT4_SRC_DIR_RESULTS], [])
+
 #
 # LB_VALIDATE_EXT4_SRC_DIR
 #