From 4edaf3e4bf0f6c09d322947a1c588a7b6fe0d481 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 10 Aug 2017 18:25:47 +0000 Subject: [PATCH] iscsi-scst/Makefile: Simplify MLNX_OFED detection for Red Hat git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7213 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 1214121aa..f5f4e3a91 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -69,12 +69,7 @@ ifeq ($(OFED_FLAVOR),MOFED) MLNX_OFED_IB_UBUNTU_INSTALLED:=$(shell if dpkg -s mlnx-ofed-kernel-dkms >/dev/null 2>/dev/null; then echo true; else echo false; fi) # Whether MLNX_OFED for RedHat has been installed - MLNX_OFED_IB_RH_INSTALLED:=$(shell if rpm -q mlnx-ofa_kernel-devel >&/dev/null; then echo true; else echo false; fi) - - # Check if we have custom compiled kernel modules - ifeq ($(MLNX_OFED_IB_RH_INSTALLED),false) - MLNX_OFED_IB_RH_INSTALLED:=$(shell if rpm -q kernel-ib-devel >&/dev/null; then echo true; else echo false; fi) - endif + MLNX_OFED_IB_RH_INSTALLED:=$(shell if { rpm -q mlnx-ofa_kernel-devel || rpm -q kernel-ib-devel; } >&/dev/null; then echo true; else echo false; fi) ifeq ($(MLNX_OFED_IB_UBUNTU_INSTALLED),true) OFED_VERS=$(shell dpkg -s mlnx-ofed-kernel-dkms | awk -F\- '/Version/ {print $$1}' | awk '{print $$2}')