From ce8389306ad009f59eb5203260df38ddda16828d Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 12 Nov 2014 15:23:06 +0100 Subject: [PATCH] LU-5953 build: use installed OFED by default with dpkg Add support for dpkg based systems (Ubuntu) when detecting installed OFED drivers. Lustre-change: http://review.whamcloud.com/16455 Reviewed-by: Dmitry Eremin Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin Signed-off-by: Minh Diep Change-Id: Ifb0b1c41e2148a59e894fbf075ae9db5b8fe5297 Signed-off-by: Nathaniel Clark Reviewed-on: http://review.whamcloud.com/20523 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons --- lnet/autoconf/lustre-lnet.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 06b6cf5..bfe4f10 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -150,7 +150,14 @@ AC_ARG_WITH([o2ib], case $with_o2ib in yes) AS_IF([which ofed_info 2>/dev/null], [ - O2IBPATHS=$(ofed_info | egrep -w 'compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' | xargs rpm -ql | grep '/openib$') + AS_IF([test x$uses_dpkg = xyes], [ + OFED_INFO="ofed_info | awk '{print \[$]2}'" + LSPKG="dpkg --listfiles" + ], [ + 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 '\(/openib\|/ofa_kernel/default\)$' | head -n1) AS_IF([test -z "$O2IBPATHS"], [ AC_MSG_ERROR([ You seem to have an OFED installed but have not installed it's devel package. -- 1.8.3.1