EX-4822 build: fix ubuntu mofed dkms

MOFED is always installed via dkms.
The path /usr/src/ofa_kernel hasn't changed
after MOFED 5.5 so we will use the
new way to detect in non-ubuntu only

Test-Parameters: trivial

Change-Id: Ie76b90f61449aaa880c44c8184691711f4ccfb19
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/46536
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index e2e6c04..854030a 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -64,6 +64,7 @@ AC_MSG_RESULT([$enable_o2ib_kernel])
 # link (both are ok for 1.5.x and 3.x versions), and should work
 # for both source and DKMS builds.
 #
+# Note: for searching for O2IBPATHS. MOFED always use dkms
 AC_DEFUN([LN_CONFIG_O2IB], [
 AC_MSG_CHECKING([whether to use Compat RDMA])
 AC_ARG_WITH([o2ib],
@@ -76,13 +77,16 @@ case $with_o2ib in
                        AS_IF([test x$uses_dpkg = xyes], [
                                OFED_INFO="ofed_info | awk '{print \[$]2}'"
                                LSPKG="dpkg --listfiles"
+                               O2IBPATHS=$(eval $OFED_INFO |
+                                           egrep -w 'mlnx-ofed-kernel-dkms|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' |
+                                           xargs $LSPKG | grep '\(/openib\|/ofa_kernel/default\|/ofa_kernel\)$' | head -n1)
                        ], [
                                OFED_INFO="ofed_info"
                                LSPKG="rpm -ql"
+                               O2IBPATHS=$(eval $OFED_INFO |
+                                           egrep -w 'mlnx-ofed-kernel-dkms|mlnx-ofa_kernel-devel|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' |
+                                           xargs $LSPKG | grep -v 'ofa_kernel-' | grep rdma_cm.h | sed 's/\/include\/rdma\/rdma_cm.h//')
                        ])
-                       O2IBPATHS=$(eval $OFED_INFO |
-                                   egrep -w 'mlnx-ofed-kernel-dkms|mlnx-ofa_kernel-devel|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' |
-                                   xargs $LSPKG | grep -v 'ofa_kernel-' | grep rdma_cm.h | sed 's/\/include\/rdma\/rdma_cm.h//')
                        AS_IF([test -z "$O2IBPATHS"], [
                                AC_MSG_ERROR([
 You seem to have an OFED installed but have not installed it's devel package.