liblustre:

  - revert yesterday's build change. current must work with old libsysio.

diff --git a/lustre/liblustre/genlib.sh b/lustre/liblustre/genlib.sh
index 2ceec0f..f371650 100755 (executable)
--- a/lustre/liblustre/genlib.sh
+++ b/lustre/liblustre/genlib.sh
@@ -15,13 +15,13 @@ CWD=`pwd`
 
 SYSIO=$1
 
-if [ ! -f $SYSIO/lib/libsysio.a ]; then
-  echo "ERROR: $SYSIO/lib/libsysio.a dosen't exist"
-  exit 1
-fi
-
+#if [ ! -f $SYSIO/lib/libsysio.a ]; then
+#  echo "ERROR: $SYSIO/lib/libsysio.a dosen't exist"
+#  exit 1
+#fi
+#
 # do cleanup at first
-rm -f liblustre.so
+#rm -f liblustre.so
 
 ALL_OBJS=
 
@@ -35,16 +35,16 @@ build_obj_list() {
 #
 # special treatment for libsysio
 #
-sysio_tmp=$CWD/sysio_tmp_`date +%s`
-build_sysio_obj_list() {
-  _objs=`$AR -t $1`
-  mkdir -p $sysio_tmp
-  $AR -x $1
-  mv $_objs $sysio_tmp
-  for _lib in $_objs; do
-    ALL_OBJS=$ALL_OBJS"$sysio_tmp/$_lib ";
-  done
-}
+#sysio_tmp=$CWD/sysio_tmp_`date +%s`
+#build_sysio_obj_list() {
+#  _objs=`$AR -t $1`
+#  mkdir -p $sysio_tmp
+#  $AR -x $1
+#  mv $_objs $sysio_tmp
+#  for _lib in $_objs; do
+#    ALL_OBJS=$ALL_OBJS"$sysio_tmp/$_lib ";
+#  done
+#}
 
 # lustre components libs
 build_obj_list . libllite.a
@@ -67,7 +67,13 @@ $AR -cru $CWD/liblsupport.a $ALL_OBJS
 $RANLIB $CWD/liblsupport.a
 
 # libsysio components libs
-build_sysio_obj_list $SYSIO/lib/libsysio.a
+build_obj_list $SYSIO/drivers/native libsysio_native.a
+build_obj_list $SYSIO/drivers/sockets libsysio_sockets.a
+build_obj_list $SYSIO/src libsysio.a
+build_obj_list $SYSIO/dev/stdfd libsysio_stdfd.a
+#
+#build_sysio_obj_list $SYSIO/lib/libsysio.a
+#
 
 # create static lib lustre
 rm -f $CWD/liblustre.a
@@ -79,4 +85,4 @@ rm -f $CWD/liblustre.so
 $LD -shared -o $CWD/liblustre.so -init __liblustre_setup_ -fini __liblustre_cleanup_ \
        $ALL_OBJS -lpthread
 
-rm -rf $sysio_tmp
+#rm -rf $sysio_tmp