Merge r7434 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7687 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:16:40 +00:00
parent 172c95b25b
commit ec49c2fa77
3 changed files with 6 additions and 6 deletions

View File

@@ -30,8 +30,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
# The file Modules.symvers has been renamed in the 2.6.18 kernel to
# Module.symvers. Find out which name to use by looking in $(KDIR).
MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \
echo Module.symvers; else echo Modules.symvers; fi)
MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
echo Modules.symvers; else echo Module.symvers; fi)
all: src/$(MODULE_SYMVERS)

View File

@@ -101,8 +101,8 @@ scst:
# The file Modules.symvers has been renamed in the 2.6.18 kernel to
# Module.symvers. Find out which name to use by looking in $(KDIR).
MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \
echo Module.symvers; else echo Modules.symvers; fi)
MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
echo Modules.symvers; else echo Module.symvers; fi)
install: all
@if [ -z "$(DESTDIR)" ] && \

View File

@@ -50,8 +50,8 @@ SRC_FILES=$(wildcard */*.[ch])
# The file Modules.symvers has been renamed in the 2.6.18 kernel to
# Module.symvers. Find out which name to use by looking in $(KDIR).
MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Module.symvers" ]; then \
echo Module.symvers; else echo Modules.symvers; fi)
MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
echo Modules.symvers; else echo Module.symvers; fi)
# Name of the OFED kernel package.
OFED_KERNEL_IB_RPM:=$(shell for r in mlnx-ofa_kernel compat-rdma kernel-ib; do rpm -q $$r 2>/dev/null | grep -q "^$$r" && echo "$$r" && break; done)