mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-02-05 17:31:06 -08:00
parent 8ab8549e89 bcdb25e550
commit 6fc7c5676f
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iscsi-scst/Makefile
View File

@@ -89,8 +89,7 @@ ifeq ($(OFED_FLAVOR),MOFED)
OFED_DIR:=/usr/src/ofa_kernel/default
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.)
-include $(OFED_DIR)/include/linux/compat-2.6.h
ISER_SYMVERS:="$(ISER_SYMVERS) $(OFED_DIR)/Module.symvers"
else
# Whether or not the OFED kernel-ib-devel RPM has been installed.

12
scripts/specialize-patch
View File

@@ -168,17 +168,6 @@ function evaluate(stmnt, pattern, arg, op, result) {
"(\\1) * 256 + (\\2)", "g", stmnt)
}
if (MOFED_MAJOR == "")
{
gsub("defined\\(MOFED_MAJOR\\)", "0", stmnt)
gsub("MOFED_MAJOR", "", stmnt)
}
else
{
gsub("defined\\(MOFED_MAJOR\\)", "1", stmnt)
gsub("MOFED_MAJOR", MOFED_MAJOR, stmnt)
}
if (SCSI_EXEC_REQ_FIFO_DEFINED != "")
{
gsub("defined[[:blank:]]+SCSI_EXEC_REQ_FIFO_DEFINED",
@@ -361,7 +350,6 @@ function handle_if(evaluated)
|| $0 ~ "INSIDE_KERNEL_TREE" \
|| $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \
|| $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
|| $0 ~ "MOFED_MAJOR" \
|| $0 ~ "RDMA_CREATE_ID_TAKES_NET_ARG" \
|| $0 ~ "REGISTER_MAD_AGENT_HAS_FLAGS_ARG" \
|| $0 ~ "RHEL_MAJOR" \

4
srpt/Makefile
View File

@@ -72,10 +72,8 @@ ifeq ($(OFED_FLAVOR),MOFED)
# header files use the LINUX_BACKPORT() macro without including
# <linux/compat-2.6.h>, include that header file explicitly.
OFED_KERNEL_DIR:=/usr/src/ofa_kernel/default
OFED_VERS=$(shell rpm -q --qf '%{version}\n' mlnx-ofa_kernel-devel 2>/dev/null; dpkg-query -W --showformat='$${Version}\n' mlnx-ofed-kernel-dkms)
OFED_VERS=$(shell rpm -q --qf '%{version}\n' mlnx-ofa_kernel-devel 2>/dev/null | grep -v ' '; dpkg-query -W --showformat='$${Version}\n' mlnx-ofed-kernel-dkms 2>/dev/null)
OFED_CFLAGS:=-I$(OFED_KERNEL_DIR)/include -include "linux/compat-2.6.h"
OFED_CFLAGS+=-DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.)
OFED_CFLAGS+=-DMOFED_MINOR=$(shell echo $(OFED_VERS) | cut -f2 -d.)
else
# OFED 1.5
OFED_KERNEL_DIR:=/usr/src/ofa_kernel