X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=ced3468a930cf97dedf1789f5c916ae3144984d3;hp=12dbd63c895cdfcd5dcec1bb920adc10ab38c814;hb=c26a4d72445c7ce02e370cc84932d7cc89416966;hpb=3b3eeeb08407588c75e47a751a72fad6ac7d78f2

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 12dbd63..ced3468 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -16,6 +16,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 	73)	LDISKFS_SERIES="3.10-rhel7.3.series"	;;
 	72)	LDISKFS_SERIES="3.10-rhel7.2.series"	;;
 	71)	LDISKFS_SERIES="3.10-rhel7.series"	;;
+	69)	LDISKFS_SERIES="2.6-rhel6.9.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"	;;
@@ -34,7 +35,9 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 		case $PLEV in
 		2) LDISKFS_SERIES="3.0-sles11.series"
 			;;
-		3|4) LDISKFS_SERIES="3.0-sles11sp3.series"
+		3) LDISKFS_SERIES="3.0-sles11sp3.series"
+			;;
+		4) LDISKFS_SERIES="3.0-sles11sp4.series"
 			;;
 		esac
 	])],[LDISKFS_SERIES="3.12-sles12.series"],[
@@ -47,6 +50,24 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 		esac
 	])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
 	    [LDISKFS_SERIES="4.4-sles12sp2.series"])
+], [test x$UBUNTU_KERNEL = xyes], [
+	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],
+		[],
+		[
+			KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p')
+			AS_IF(
+				[test -z "$KPLEV"], [
+					AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
+					LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"
+				],
+				[test $KPLEV -ge 73], [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"],
+				[test $KPLEV -ge 62], [LDISKFS_SERIES="4.4.0-62-ubuntu14+16.series"],
+				[test $KPLEV -ge 49], [LDISKFS_SERIES="4.4.0-49-ubuntu14+16.series"],
+				[LDISKFS_SERIES="4.4.0-45-ubuntu14+16.series"]
+			)
+		],
+		[LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"]
+	)
 ])
 ])
 AS_IF([test -z "$LDISKFS_SERIES"],
@@ -237,6 +258,7 @@ AS_IF([test x$enable_ldiskfs != xno],[
 	# set is available for the detected kernel.  For now, we just always
 	# set it to "yes".
 	AS_IF([test x$enable_ldiskfs = xmaybe], [enable_ldiskfs=yes])
+	AC_SUBST(ENABLE_LDISKFS, yes)
 
 	LDISKFS_LINUX_SERIES
 	LDISKFS_AC_PATCH_PROGRAM
@@ -253,6 +275,8 @@ AS_IF([test x$enable_ldiskfs != xno],[
 	AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1, [enable encryption for ldiskfs])
 	AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
 	AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
+], [
+	AC_SUBST(ENABLE_LDISKFS, no)
 ])
 
 AC_MSG_CHECKING([whether to build ldiskfs])