X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=06a954670eff1250ad6346585e4bfa7878698a42;hb=refs%2Fchanges%2F07%2F33107%2F3;hp=83b4cbcc75b634584c91682c2fb200b1b5b045bd;hpb=2deec088aa4e1153bc00730c2b1b4bf5d40d275a;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 83b4cbc..06a9546 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,6 +13,8 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
 	case $RHEL_RELEASE_NO in
+	75)	LDISKFS_SERIES="3.10-rhel7.5.series"	;;
+	74)	LDISKFS_SERIES="3.10-rhel7.4.series"	;;
 	73)	LDISKFS_SERIES="3.10-rhel7.3.series"	;;
 	72)	LDISKFS_SERIES="3.10-rhel7.2.series"	;;
 	71)	LDISKFS_SERIES="3.10-rhel7.series"	;;
@@ -25,6 +27,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 	6[0-3])	LDISKFS_SERIES="2.6-rhel6.series"	;;
 	esac
 ], [test x$SUSE_KERNEL = xyes], [
+	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
@@ -49,7 +52,37 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 			;;
 		esac
 	])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
-	    [LDISKFS_SERIES="4.4-sles12sp2.series"])
+	    [LDISKFS_SERIES="4.4-sles12sp2.series"]
+	)], [LDISKFS_SERIES="4.4-sles12sp3.series"],
+            [LDISKFS_SERIES="4.4-sles12sp3.series"])
+], [test x$UBUNTU_KERNEL = xyes], [
+	AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[
+	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"])],
+	[
+		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.15.0-20-ubuntu18.series"
+			],
+			[test $KPLEV -ge 20], [LDISKFS_SERIES="4.15.0-20-ubuntu18.series"]
+		)
+	],
+	[LDISKFS_SERIES="4.15.0-20-ubuntu18.series"])
 ])
 ])
 AS_IF([test -z "$LDISKFS_SERIES"],
@@ -240,6 +273,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
@@ -256,6 +290,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])
@@ -321,11 +357,21 @@ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
 	EXT4_SRC_DIR="$linux_src/fs/ext4"
 ], [
 	# Kernel ext source provided by kernel-debuginfo-common package
-	linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \
+	# that extracted to $LINUX
+	linux_src=$(ls -1d $linux_src/../../debug/*/linux-${LINUXRELEASE%.*}* \
 		2>/dev/null | tail -1)
-	AS_IF([test -e "$linux_src/fs/ext4/super.c"],
-		[EXT4_SRC_DIR="$linux_src/fs/ext4"],
-		[EXT4_SRC_DIR=""])
+	AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+		EXT4_SRC_DIR="$linux_src/fs/ext4"
+	], [
+		# Kernel ext source provided by kernel-debuginfo-common package
+		linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \
+			2>/dev/null | tail -1)
+		AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+			EXT4_SRC_DIR="$linux_src/fs/ext4"
+		], [
+			EXT4_SRC_DIR=""
+		])
+	])
 ])
 AC_MSG_RESULT([$EXT4_SRC_DIR])
 AC_SUBST(EXT4_SRC_DIR)