LU-5276 build: handle RHEL ldiskfs series more accurated

Since RHEL7 change RHEL_RELEASE macro format. So we need
a unified way to handle it. Change using RHEL_MAJOR &
RHEL_MINOR to decided which ldiskfs series to be choose.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: I147c4ff01372f4aafcdbce6197c7a85e9d64027b
Reviewed-on: http://review.whamcloud.com/11398
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 4cf15a1..96fc0e7 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -5,12 +5,12 @@ AC_DEFUN([LDISKFS_LINUX_SERIES], [
 LDISKFS_SERIES=
 AC_MSG_CHECKING([which ldiskfs series to use])
 AS_IF([test x$RHEL_KERNEL = xyes], [
-       AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-431],[
-       AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-343],[
-       AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32],[],
-       [LDISKFS_SERIES="2.6-rhel6.series"],  [LDISKFS_SERIES="2.6-rhel6.series"])],
-       [LDISKFS_SERIES="2.6-rhel6.4.series"],[LDISKFS_SERIES="2.6-rhel6.4.series"])],
-       [LDISKFS_SERIES="2.6-rhel6.5.series"],[LDISKFS_SERIES="2.6-rhel6.5.series"])
+       case $RHEL_RELEASE_NO in
+       70)     LDISKFS_SERIES="3.10-rhel7.series"      ;;
+       65)     LDISKFS_SERIES="2.6-rhel6.5.series"     ;;
+       64)     LDISKFS_SERIES="2.6-rhel6.4.series"     ;;
+       6[0-3]) LDISKFS_SERIES="2.6-rhel6.series"       ;;
+       esac
 ], [test x$SUSE_KERNEL = xyes], [
        AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32], [],

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 9d94761..3ba2e9c 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -88,17 +88,18 @@ AC_MSG_RESULT($RELEASE)
 AC_SUBST(RELEASE)
 
 # check if the kernel is one from RHEL or SUSE
-AC_CACHE_CHECK([for RedHat kernel version], lb_cv_rhel_kernel_version, [
+AC_CACHE_CHECK([for RedHat kernel release number], lb_cv_rhel_kernel_version, [
 lb_cv_rhel_kernel_version=""
-AS_IF([fgrep -q RHEL_RELEASE $LINUX_OBJ/include/$VERSION_HDIR/version.h],
-       [RHEL_RELEASE=$(expr 0$(awk -F \" '/ RHEL_RELEASE / { print [$]2 }' \
-                      $LINUX_OBJ/include/$VERSION_HDIR/version.h) + 1)
-       KERNEL_VERSION=$(sed -e 's/\(@<:@23@:>@\.@<:@0-9@:>@*\.@<:@0-9@:>@*\).*/\1/' <<< $LINUXRELEASE)
-       lb_cv_rhel_kernel_version=${KERNEL_VERSION}-${RHEL_RELEASE}])
+AS_IF([fgrep -q RHEL_RELEASE $LINUX_OBJ/include/$VERSION_HDIR/version.h], [
+       lb_cv_rhel_kernel_version=$(awk '/ RHEL_MAJOR / { print [$]3 }' \
+               $LINUX_OBJ/include/$VERSION_HDIR/version.h)$(awk \
+               '/ RHEL_MINOR / { print [$]3 }' \
+               $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+])
 ])
 AS_IF([test -n "$lb_cv_rhel_kernel_version"], [
        RHEL_KERNEL="yes"
-       RHEL_KERNEL_VERSION=$lb_cv_rhel_kernel_version
+       RHEL_RELEASE_NO=$lb_cv_rhel_kernel_version
 ], [
        RHEL_KERNEL="no"
        LB_CHECK_CONFIG([SUSE_KERNEL], [SUSE_KERNEL="yes"], [SUSE_KERNEL="no"])