From 492e570df0d7e34729fe9d269cc03fc410c55aa5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Feb 2010 19:28:58 +0000 Subject: [PATCH] Made ib_srpt easier to build on a multiboot system where multiple kernels have been installed -- one kernel with OFED and one or more kernels without OFED. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1498 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index 14713ae31..146245b48 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -22,10 +22,10 @@ MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \ echo Module.symvers; else echo Modules.symvers; fi) # Whether or not the OFED kernel modules have been installed. -OFED_KERNEL_IB_RPM_INSTALLED:=$(shell if rpm -q kernel-ib >/dev/null 2>&1; then echo true; else echo false; fi) +OFED_KERNEL_IB_RPM_INSTALLED:=$(shell if rpm -q kernel-ib 2>/dev/null | grep -q $$(uname -r | sed 's/-/_/g'); then echo true; else echo false; fi) # Whether or not the OFED kernel-ib-devel RPM has been installed. -OFED_KERNEL_IB_DEVEL_RPM_INSTALLED:=$(shell if rpm -q kernel-ib-devel >/dev/null 2>&1; then echo true; else echo false; fi) +OFED_KERNEL_IB_DEVEL_RPM_INSTALLED:=$(shell if rpm -q kernel-ib-devel 2>/dev/null | grep -q $$(uname -r | sed 's/-/_/g'); then echo true; else echo false; fi) ifeq ($(OFED_KERNEL_IB_DEVEL_RPM_INSTALLED),true) # Read OFED's config.mk, which contains the definition of the variable