From 422d670126feb7e101c79357f70039038e55137f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 28 Dec 2019 04:28:19 +0000 Subject: [PATCH] srpt, isert-scst: Fix the build against MOFED This patch is a fix for commit a16950059055 ("Makefiles: Use KBUILD_EXTRA_SYMBOLS instead of copying Module.symvers"; r8686). Reported-by: Grant Albitz git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8758 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 5 +++-- srpt/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index e3c436aed..b935c040e 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -84,7 +84,8 @@ ifeq ($(OFED_FLAVOR),MOFED) -include $(OFED_DIR)/include/linux/compat-2.6.h \ -DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.)\ -DMOFED_MINOR=$(shell echo $(OFED_VERS) | cut -f2 -d.) - ISER_SYMVERS:=$(ISER_SYMVERS) $(OFED_DIR)/$(MODULE_SYMVERS) + OFED_MODULE_SYMVERS:=$(OFED_DIR)/$(MODULE_SYMVERS) + ISER_SYMVERS:=$(ISER_SYMVERS) $(OFED_MODULE_SYMVERS) OFED_CONFIG:= CONFIG_DTRACE= else # Whether or not the OFED kernel-ib-devel RPM has been installed. @@ -108,7 +109,7 @@ else endif # Use make instead of $(MAKE) to get rid of command-line option -i -run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0) CONFTESTS = $(shell ls -d conftest/*) diff --git a/srpt/Makefile b/srpt/Makefile index 837bef3a0..1b4344a2d 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -82,7 +82,7 @@ OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS) endif # Use make instead of $(MAKE) to get rid of command-line option -i -run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0) CONFTESTS = $(shell ls -d conftest/*)