revert my previous commit due to it brokes rpm build

diff --git a/Makefile.in b/Makefile.in
index b1e9013..3ae031d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
 subdir-m += lnet
 subdir-m += lustre
 subdir-m += lnet
 subdir-m += lustre

-subdir-m += lustre-iokit

 
 @INCLUDE_RULES@
 
 @INCLUDE_RULES@

diff --git a/autoMakefile.am b/autoMakefile.am
index add75e4..ab75c70 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,4 +1,4 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ lnet lustre
+SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre

 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@
 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 43cd54f..47be784 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -160,46 +160,6 @@ AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
 ])
 
 #

-# LB_PATH_LUSTREIOKIT
-#
-# Handle internal/external lustre-iokit
-#
-AC_DEFUN([LB_PATH_LUSTREIOKIT],
-[AC_ARG_WITH([],
-       AC_HELP_STRING([--with-lustre-iokit=path],
-                       [set path to lustre-iokit source (default is included lustre-iokit)]),
-       [],[
-                       with_lustre_iokit='yes'
-       ])
-AC_MSG_CHECKING([location of lustre-iokit])
-enable_lustre_iokit="$with_lustre_iokit"
-case x$with_lustre_iokit in
-       xyes)
-               AC_MSG_RESULT([internal])
-               LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
-                       AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
-               ])
-               LUSTREIOKIT_SUBDIR="lustre-iokit"
-               LUSTREIOKIT="$PWD/lustre-iokit"
-               ;;
-       xno)
-               AC_MSG_RESULT([disabled])
-               ;;
-       *)
-               AC_MSG_RESULT([$with_lustre_iokit])
-               LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
-                       AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
-               ])
-               LUSTREIOKIT="$with_lustre_iokit"
-               with_lustre_iokit="yes"
-               ;;
-esac
-AC_SUBST(LUSTREIOKIT_SUBDIR)
-# We have to configure even if we don't build here for make dist to work
-AC_CONFIG_SUBDIRS(lustre-iokit)
-])
-
-#

 # LB_PATH_LDISKFS
 #
 # Handle internal/external ldiskfs
 # LB_PATH_LDISKFS
 #
 # Handle internal/external ldiskfs


@@ -680,7 +640,6 @@ LB_CONFIG_MODULES
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LDISKFS
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LDISKFS

-LB_PATH_LUSTREIOKIT

 
 LC_CONFIG_LIBLUSTRE
 LN_CONFIGURE
 
 LC_CONFIG_LIBLUSTRE
 LN_CONFIGURE

diff --git a/build/autogen.sh b/build/autogen.sh
index b406459..1892ed1 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -85,7 +85,7 @@ if [ -d kernel_patches ] ; then
 else
     REQUIRED_DIRS="build lnet lustre"
     OPTIONAL_DIRS="snmp portals"
 else
     REQUIRED_DIRS="build lnet lustre"
     OPTIONAL_DIRS="snmp portals"

-    CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
+    CONFIGURE_DIRS="libsysio ldiskfs"

 fi
 
 for dir in $REQUIRED_DIRS ; do
 fi
 
 for dir in $REQUIRED_DIRS ; do

diff --git a/build/buildcvs b/build/buildcvs
index a73a521..cd838ea 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,7 +5,6 @@ lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"

-lustreiokittag="HEAD"

 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 


@@ -250,7 +249,6 @@ cvs_cmd lnet lnet "$lnettag"
 cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 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"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build
 hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build