From dc869faeca006d8bbcb79d0a4d3681d417c94e5a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 12 Jun 2014 13:38:38 +0000 Subject: [PATCH] ib_srpt: Make non-OFED build work again git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5595 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index 1d15d5f28..4a4c2efd4 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -53,8 +53,9 @@ OFED_KERNEL_IB_RPM:=$(shell for r in mlnx-ofa_kernel compat-rdma kernel-ib; do r # Name of the OFED kernel development RPM. OFED_KERNEL_IB_DEVEL_RPM:=$(shell for r in mlnx-ofa_kernel-devel compat-rdma-devel kernel-ib-devel; do rpm -q $$r 2>/dev/null | grep -q "^$$r" && echo $$r && break; done) -OFED_FLAVOR=$(shell if /usr/bin/ofed_info 2>/dev/null | grep -q "^MLNX_OFED"; then echo MOFED; else echo OFED; fi) +OFED_FLAVOR=$(shell /usr/bin/ofed_info 2>/dev/null | head -n1 | sed -n 's/^MLNX_OFED.*/MOFED/p;s/^OFED-.*/OFED/p') +ifneq ($(OFED_KERNEL_IB_RPM),) ifeq ($(OFED_KERNEL_IB_RPM),compat-rdma) # OFED 3.x OFED_KERNEL_DIR:=/usr/src/compat-rdma @@ -70,7 +71,6 @@ include $(OFED_KERNEL_DIR)/config.mk OFED_CFLAGS:=$(BACKPORT_INCLUDES) -I$(OFED_KERNEL_DIR)/include endif endif -ifneq ($(OFED_KERNEL_IB_RPM),) # Any OFED version OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/Module.symvers endif