Branch b_hd_dmu

Updated library names and paths due to zfs-lustre changes.
Updated lustrecvs to show helpful message if mercurial is missing.
Changed default zfs-lustre path from zfs-lustre/ to lustre/zfs-lustre/.
Added paths of zfs-lustre tools to test-framework.sh.

b=14778
i=alex.zhuravlev
i=manoj.joseph

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index dd9fc53..0660393 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -357,26 +357,17 @@ AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
 
 #
 # LB_PATH_DMU
-# Support for --with-dmu
 #
 AC_DEFUN([LB_PATH_DMU],
 [AC_MSG_CHECKING([whether to enable DMU])
-AC_ARG_WITH([dmu],
-       AC_HELP_STRING([--with-dmu=path],
-                      [set path to a DMU tree (default is included zfs-lustre)]),
-       [
-               DMU_SRC=$with_dmu
-       ],
-       [
-               DMU_SRC="$PWD/zfs-lustre"
-       ])
 if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then
+       DMU_SRC="$PWD/lustre/zfs-lustre"
        AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
        AC_MSG_RESULT([yes])
        LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
                AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
        ])
-       AC_CONFIG_SUBDIRS(zfs-lustre)
+       AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        dmu_osd='yes'
 else
        AC_MSG_RESULT([no])

diff --git a/build/buildcvs b/build/buildcvs
index c5713dd..913dd59 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -269,7 +269,7 @@ cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
-hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
 cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build

diff --git a/lustrecvs b/lustrecvs
index d6afe49..46168d6 100755 (executable)
--- a/lustrecvs
+++ b/lustrecvs
@@ -143,6 +143,16 @@ hg_cmd ()
         return
     fi
 
+    if ! which hg &> /dev/null; then
+    cat <<EOF
+
+Error: Mercurial is missing, try 'yum install mercurial', 'apt-get install
+mercurial' or try http://rpmfind.net/linux/rpm2html/search.php?query=mercurial
+EOF
+        error_modules="$dir $error_modules"
+        return
+    fi
+
     url="$base_url/$repository"
 
     # create a cvs date format that will survive shell expansion