X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Flustre-build-ldiskfs.m4;h=2d427649ca0b213fd14f28a6dde39d465594a2ee;hb=1101120d3258509fa74f952cd8664bfdc17bd97d;hp=c815b84dcb510b0aaaf4d5da21fa9d5c68c55095;hpb=52aa92420fe9829603bfb98dcda31bf22d995e42;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index c815b84..2d42764 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -2,11 +2,20 @@
 # 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"	;;
+	68)	LDISKFS_SERIES="2.6-rhel6.8.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"	;;
@@ -26,7 +35,16 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 		3|4) LDISKFS_SERIES="3.0-sles11sp3.series"
 			;;
 		esac
-	])],[LDISKFS_SERIES="3.12-sles12.series"],[LDISKFS_SERIES="3.12-sles12.series"])
+	])],[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])])