X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-linux.m4;h=3ba2e9c2f893ec234d2c0b4aa9ea802ec2e1a080;hp=9d94761adb61831defe93816e5f11f72ad803dd7;hb=995921a5c1e53b4d717de21dd3210406f6833689;hpb=8a1d98bc86c87af064bbf87a2349cc314573dbc5

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 9d94761..3ba2e9c 100644
--- 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"])