LU-3939 tests: sanity-hsm/test_40 needs a local HSM_ARCHIVE

[fs/lustre-release.git] / config / lustre-build-ldiskfs.m4

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 857f429..4b15de3 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,7 +13,15 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[],
        [SER="2.6-sles11.series"],[SER="2.6-sles11.series"])],
        AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[],
        [SER="2.6-sles11.series"],[SER="2.6-sles11.series"])],

-       [SER="3.0-sles11.series"],[SER="3.0-sles11.series"])
+       [SER="3.0-sles11.series"],[
+               PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
+               case $PLEV in
+               2) SER="3.0-sles11.series"
+                       ;;
+               3) SER="3.0-sles11sp3.series"
+                       ;;
+               esac
+       ])

 ])
 LDISKFS_SERIES=$SER
 
 ])
 LDISKFS_SERIES=$SER
 


@@ -138,12 +146,12 @@ AS_IF([test x$enable_ldiskfs != xno],[
 
        LDISKFS_LINUX_SERIES
        LDISKFS_AC_PATCH_PROGRAM
 
        LDISKFS_LINUX_SERIES
        LDISKFS_AC_PATCH_PROGRAM

-       LB_EXT4_SRC_DIR

        LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
        LB_EXT_PBLOCK
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])
        LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
        LB_EXT_PBLOCK
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])

+       AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs])

        AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
        AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 ])
        AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
        AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 ])