From 4edaf3e4bf0f6c09d322947a1c588a7b6fe0d481 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 10 Aug 2017 18:25:47 +0000 Subject: [PATCH 1/3] 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}') From 64d40aeeb2c4feea17889701316eb5d413485b0d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 10 Aug 2017 18:26:29 +0000 Subject: [PATCH 2/3] iscsi-scst/Makefile: Simplify MLNX_OFED support code git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7214 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index f5f4e3a91..b86444953 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -73,21 +73,19 @@ ifeq ($(OFED_FLAVOR),MOFED) ifeq ($(MLNX_OFED_IB_UBUNTU_INSTALLED),true) OFED_VERS=$(shell dpkg -s mlnx-ofed-kernel-dkms | awk -F\- '/Version/ {print $$1}' | awk '{print $$2}') - OFED_CFLAGS:=-I/var/lib/dkms/mlnx-ofed-kernel/$(OFED_VERS)/build/include -include /var/lib/dkms/mlnx-ofed-kernel/$(OFED_VERS)/build/include/linux/compat-2.6.h - ISER_SYMVERS:="$(ISER_SYMVERS) /var/lib/dkms/mlnx-ofed-kernel/$(OFED_VERS)/build/Module.symvers" + OFED_DIR:=/var/lib/dkms/mlnx-ofed-kernel/$(OFED_VERS)/build endif ifeq ($(MLNX_OFED_IB_RH_INSTALLED),true) OFED_VERS=$(shell rpm -q --qf '%{version}\n' mlnx-ofa_kernel-devel \ 2>/dev/null) - OFED_CFLAGS:=-I/usr/src/ofa_kernel/default/include -include /usr/src/ofa_kernel/default/include/linux/compat-2.6.h - ISER_SYMVERS:="$(ISER_SYMVERS) /usr/src/ofa_kernel/default/Module.symvers" + OFED_DIR:=/usr/src/ofa_kernel/default endif - # Make the version of the MOFED kernel package available to C source - # files such that it can be used in #ifdef statements where MOFED - # uses an older version of the RDMA API than the upstream kernel. - OFED_CFLAGS+=-DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.) + OFED_CFLAGS:= -I$(OFED_DIR)/include \ + -include $(OFED_DIR)/include/linux/compat-2.6.h \ + -DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.) + ISER_SYMVERS:="$(ISER_SYMVERS) $(OFED_DIR)/Module.symvers" else # 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 2>/dev/null | grep -q $$(uname -r | sed 's/-/_/g'); then echo true; else echo false; fi) From f3d11b715bec8dd415cd38addcdcb9d44b33e6f8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 10 Aug 2017 19:39:27 +0000 Subject: [PATCH 3/3] iscsi-scst/Makefile: Add include/uapi directory to the include path Reported-by: Sergey Gorenko git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7215 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index b86444953..7b98dd1e1 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -83,6 +83,7 @@ ifeq ($(OFED_FLAVOR),MOFED) endif OFED_CFLAGS:= -I$(OFED_DIR)/include \ + -I$(OFED_DIR)/include/uapi \ -include $(OFED_DIR)/include/linux/compat-2.6.h \ -DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.) ISER_SYMVERS:="$(ISER_SYMVERS) $(OFED_DIR)/Module.symvers"