From e531ee56431426db9c0cfb176aa05b16b64cda05 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Fri, 4 Jul 2008 15:23:23 +0000
Subject: [PATCH] check both names for symver file. Branch HEAD b=15870 i=brian
---
lnet/autoconf/lustre-lnet.m4 | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 3443063a84..df242b0517 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -516,15 +516,21 @@ else
O2IBLND=""
O2IBCPPFLAGS=""
])
-
# we know at this point that the found OFED source is good
- if test \( $ENABLEO2IB = 3 \); then
- if test \( -f $O2IBPATH/Module.symvers \); then
- AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/$SYMVERFILE])
+ O2IB_SYMVER=""
+ if test $ENABLEO2IB -eq 3 ; then
+ # OFED default rpm not handle sles10 Modules.symvers name
+ for name in Module.symvers Modules.symvers; do
+ if test -f $O2IBPATH/$name; then
+ O2IB_SYMVER=$name;
+ break;
+ fi
+ done
+ if test -n $O2IB_SYMVER ; then
+ AC_MSG_NOTICE([adding $O2IBPATH/$O2IB_SYMVER to $PWD/$SYMVERFILE])
# strip out the existing symbols versions first
- touch $O2IBPATH/Module.symvers
- egrep -v $(echo $(awk '{ print $2 }' $O2IBPATH/Module.symvers) | tr ' ' '|') $PWD/$SYMVERFILE > $PWD/$SYMVERFILE.old
- cat $PWD/$SYMVERFILE.old $O2IBPATH/Module.symvers > $PWD/$SYMVERFILE
+ egrep -v $(echo $(awk '{ print $2 }' $O2IBPATH/$O2IB_SYMVER) | tr ' ' '|') $PWD/$SYMVERFILE > $PWD/$SYMVERFILE.old
+ cat $PWD/$SYMVERFILE.old $O2IBPATH/$O2IB_SYMVER > $PWD/$SYMVERFILE
else
AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
fi
--
GitLab