LU-4629 lov: fix sscanf format specification

[fs/lustre-release.git] / lnet / utils / genlib.sh

diff --git a/lnet/utils/genlib.sh b/lnet/utils/genlib.sh
index 66acf6a..02b22c6 100755 (executable)
--- a/lnet/utils/genlib.sh
+++ b/lnet/utils/genlib.sh
@@ -2,10 +2,6 @@
 #set -xv
 set -e
 
-AR=/usr/bin/ar
-LD=/usr/bin/ld
-RANLIB=/usr/bin/ranlib
-
 CWD=`pwd`
 
 LIBS=$1
@@ -18,20 +14,18 @@ rm -f liblst.so
 ALL_OBJS=
 
 build_obj_list() {
-  _objs=`$AR -t $1/$2`
+       _objs=`$AR -t $1/$2 | grep -v SYMDEF | grep -v SORTED`
   for _lib in $_objs; do
     ALL_OBJS=$ALL_OBJS"$1/$_lib ";
   done;
 }
 
 # lnet components libs
-build_obj_list ../../lnet/libcfs libcfs.a
+build_obj_list ../../libcfs/libcfs libcfs.a
+build_obj_list ../../libcfs/libcfs libcfsutil.a
 if $(echo "$LND_LIBS" | grep "socklnd" >/dev/null) ; then
        build_obj_list ../../lnet/ulnds/socklnd libsocklnd.a
 fi
-if $(echo "$LND_LIBS" | grep "ptllnd" >/dev/null) ; then
-       build_obj_list ../../lnet/ulnds/ptllnd libptllnd.a
-fi
 build_obj_list ../../lnet/lnet liblnet.a
 build_obj_list ../../lnet/selftest libselftest.a