X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=3115a973380141640353967e5e95df1b70b01c4b;hp=a19ac4eadece0d8ac255fe24f8803523809384c8;hb=3c94dc6c6156054293f1e794294036940ee5d578;hpb=eaf30e35002bf3936cdf7bf83685552d854f0f88

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index a19ac4e..3115a97 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -2,17 +2,27 @@
 # LDISKFS_LINUX_SERIES
 #
 AC_DEFUN([LDISKFS_LINUX_SERIES], [
-LDISKFS_SERIES=
 AC_MSG_CHECKING([which ldiskfs series to use])
+case x$LDISKFS_SERIES in
+	x)			# not set
+		;;
+	*.series)		# set externally
+		;;
+	*) LDISKFS_SERIES=
+esac
+AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
 	case $RHEL_RELEASE_NO in
+	72)	LDISKFS_SERIES="3.10-rhel7.2.series"	;;
 	71)	LDISKFS_SERIES="3.10-rhel7.series"	;;
+	67)	LDISKFS_SERIES="2.6-rhel6.7.series"	;;
 	66)	LDISKFS_SERIES="2.6-rhel6.6.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.12.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32], [],
 	[LDISKFS_SERIES="2.6-sles11.series"],[LDISKFS_SERIES="2.6-sles11.series"])],
@@ -21,11 +31,20 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 		case $PLEV in
 		2) LDISKFS_SERIES="3.0-sles11.series"
 			;;
-		3) LDISKFS_SERIES="3.0-sles11sp3.series"
+		3|4) LDISKFS_SERIES="3.0-sles11sp3.series"
+			;;
+		esac
+	])],[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"
 			;;
 		esac
 	])
 ])
+])
 AS_IF([test -z "$LDISKFS_SERIES"],
 	[AC_MSG_WARN([Unknown kernel version $LDISKFS_VERSIONRELEASE])])
 AC_MSG_RESULT([$LDISKFS_SERIES])
@@ -200,7 +219,7 @@ AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
 #
 # LB_VALIDATE_EXT4_SRC_DIR
 #
-# Spot check the existance of several source files common to ext4.
+# Spot check the existence of several source files common to ext4.
 # Detecting this at configure time allows us to avoid a potential build
 # failure and provide a useful error message to explain what is wrong.
 #