Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4257 llite: fix up iov_iter implementation
[fs/lustre-release.git]
/
config
/
lustre-build-ldiskfs.m4
diff --git
a/config/lustre-build-ldiskfs.m4
b/config/lustre-build-ldiskfs.m4
index
c815b84
..
2d42764
100644
(file)
--- 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_LINUX_SERIES
#
AC_DEFUN([LDISKFS_LINUX_SERIES], [
-LDISKFS_SERIES=
AC_MSG_CHECKING([which ldiskfs series to use])
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
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" ;;
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" ;;
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
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])])
])
AS_IF([test -z "$LDISKFS_SERIES"],
[AC_MSG_WARN([Unknown kernel version $LDISKFS_VERSIONRELEASE])])