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

Move KBUILD_EXTRA_SYMBOLS definitions into the kernel Makefiles

Browse Source 
$(KBUILD_EXTRA_SYMBOLS) is not only used at compile time but also at link
time. Move the $(KBUILD_EXTRA_SYMBOLS) definitions such that it is
available both at compile time and at link time.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9000 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2020-06-01 02:15:47 +00:00
parent 80ac4d2810
commit 9be61ba538
13 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fcst/Makefile
View File

@@ -63,8 +63,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
SCST_DIR := $(shell echo "$$PWD")/../scst/src
all:
$(MAKE) -C $(KDIR) M=$(shell pwd) \
KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd)
install: all
KDIR=$(KDIR) ../scripts/sign-modules

1
fcst/Makefile_in-tree
View File

@@ -1,3 +1,4 @@
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
ccflags-y += -I$(src)/../scst/include
obj-$(CONFIG_FCST) += fcst.o

9
iscsi-scst/Makefile
View File

@@ -46,7 +46,6 @@ INFINIBAND_ENABLED = $(shell syms=$$(dirname "$(KDIR)")/modules.symbols; if [ -e
all: progs mods
ISER_SYMVERS:=$(KMOD)/Module.symvers
OFED_CFLAGS:=
OFED_FLAVOR=$(shell if [ -e /usr/bin/ofed_info ]; then /usr/bin/ofed_info 2>/dev/null | head -n1 | sed -n 's/^\(MLNX_OFED\|OFED-internal\).*/MOFED/p;s/^OFED-.*/OFED/p'; else echo in-tree; fi)
@@ -80,7 +79,6 @@ ifeq ($(OFED_FLAVOR),MOFED)
-DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.)\
-DMOFED_MINOR=$(shell echo $(OFED_VERS) | cut -f2 -d.)
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.
@@ -94,12 +92,10 @@ else
# BACKPORT_INCLUDES.
include /usr/src/ofa_kernel/config.mk
OFED_CFLAGS:=$(shell echo $(BACKPORT_INCLUDES) -I/usr/src/ofa_kernel/include)
ISER_SYMVERS:=$(ISER_SYMVERS) /usr/src/ofa_kernel/Module.symvers
endif
ifeq ($(OFED_COMPAT_RDMA_DEVEL_RPM_INSTALLED),true)
OFED_CFLAGS:=-I/usr/src/compat-rdma/include -include /usr/src/compat-rdma/include/linux/compat-2.6.h
ISER_SYMVERS:=$(ISER_SYMVERS) /usr/src/compat-rdma/Module.symvers
endif
endif
@@ -121,13 +117,12 @@ PRE_CFLAGS = $(shell \
ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(PRE_CFLAGS)
mods: include/iscsi_scst_itf_ver.h $(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) M=$(KMOD) PRE_CFLAGS="$(PRE_CFLAGS)" modules \
KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
$(MAKE) -C $(KDIR) M=$(KMOD) PRE_CFLAGS="$(PRE_CFLAGS)" modules
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
echo " Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
$(MAKE) -C $(KDIR) M=$(ISERTMOD) PRE_CFLAGS="$(ISER_CFLAGS)" \
KBUILD_EXTRA_SYMBOLS="$(ISER_SYMVERS)" $(OFED_CONFIG) modules; \
$(OFED_CONFIG) modules; \
fi
progs: include/iscsi_scst_itf_ver.h

2
iscsi-scst/kernel/Makefile
View File

@@ -20,6 +20,8 @@
#
# Note 2! The CFLAGS definitions are now in the main makefile.
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers
ccflags-y += -I$(src)/../include -I$(src)/../../scst/include
ccflags-y += $(call cc-option,-Wextra) \
$(call cc-option,-Wno-old-style-declaration) \

3
iscsi-scst/kernel/isert-scst/Makefile
View File

@@ -21,6 +21,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers \
$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
[ -e $$d ] || continue; echo $$d; break; done)
ccflags-y += -I$(src)/../../include -I$(src)/../../../scst/include
ccflags-y += $(call cc-option,-Wextra) \
$(call cc-option,-Wno-old-style-declaration) \

6
qla2x00t-32gbit/qla2x00-target/Makefile
View File

@@ -60,6 +60,9 @@ QLA2XXX_SCST := qla2xxx_scst
endif
ifneq ($(PATCHLEVEL),)
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
$(src)/../Module.symvers
ccflags-y += -I$(src)/../../scst/include
ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
@@ -85,8 +88,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
SCST_DIR := $(shell echo "$$PWD/../../scst/src")
all: $(QLA2XXX_SCST)
$(MAKE) -C $(KDIR) M=$(shell pwd) \
KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(QLA2XXX_DIR)/Module.symvers"
$(MAKE) -C $(KDIR) M=$(shell pwd)
install: all
ifneq ($(BUILD_2X_MODULE),)

2
qla2x00t/Makefile
View File

@@ -1,5 +1,7 @@
ifeq ($(BUILD_2X_MODULE),)
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/Module.symvers
qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o qla_nx.o

9
qla2x00t/qla2x00-target/Makefile
View File

@@ -59,6 +59,9 @@ QLA2XXX_SCST := qla2xxx_scst
endif
ifneq ($(PATCHLEVEL),)
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
$(src)/../Module.symvers
ccflags-y += -I$(src)/../../scst/include
ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
@@ -84,8 +87,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
SCST_DIR := $(shell echo "$$PWD/../../scst/src")
all: $(QLA2XXX_SCST)
$(MAKE) -C $(KDIR) M=$(shell pwd) \
KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(QLA2XXX_DIR)/Module.symvers"
$(MAKE) -C $(KDIR) M=$(shell pwd)
install: all
ifneq ($(BUILD_2X_MODULE),)
@@ -106,8 +108,7 @@ endif
ifneq ($(BUILD_2X_MODULE),)
qla2xxx_scst:
$(MAKE) BUILD_2X_MODULE=$(BUILD_2X_MODULE) CONFIG_SCSI_QLA2XXX_TARGET=y \
M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all \
KBUILD_EXTRA_SYMBOLS=$(QLA2XXX_DIR)/Module.symvers
M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all
endif
########## END OUT-OF-TREE RULES ##########

3
scst/src/Makefile
View File

@@ -115,8 +115,7 @@ $(SCST_INTF_VER_FILE): $(SCST_INC_DIR)/scst.h $(SCST_INC_DIR)/scst_const.h $(SCS
all: $(SCST_INTF_VER_FILE)
$(MAKE) -C certs KDIR=$(KDIR)
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=m \
KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=m
scst:
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=n

3
scst/src/dev_handlers/Makefile
View File

@@ -30,7 +30,8 @@
SHELL=/bin/bash
ifneq ($(PATCHLEVEL),)
ccflags-y += -I$(KBUILD_EXTMOD)/../include \
KBUILD_EXTRA_SYMBOLS=$(src)/../../Module.symvers
ccflags-y += -I$(src)/../../include \
$(call cc-option,-Wextra) \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare
#ccflags-y += -DCONFIG_DEBUG_EXT_COPY_REMAP

4
scst_local/Makefile
View File

@@ -7,6 +7,7 @@ SHELL=/bin/bash
KMOD := $(shell pwd)/kernel
ifneq ($(PATCHLEVEL),)
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
ccflags-y += -I$(src)/../scst/include
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter\
-Wno-missing-field-initializers
@@ -43,8 +44,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
SCST_DIR := $(shell echo "$$PWD")/../scst/src
all:
$(MAKE) -C $(KDIR) M=$(shell pwd) \
KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd)
install: all
KDIR=$(KDIR) ../scripts/sign-modules

3
srpt/Makefile
View File

@@ -94,8 +94,7 @@ PRE_CFLAGS = $(OFED_CFLAGS) \
all: check $(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)"\
$(OFED_CONFIG) modules\
KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(OFED_MODULE_SYMVERS)"
$(OFED_CONFIG) modules
install: all
@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \

3
srpt/src/Makefile
View File

@@ -1,5 +1,8 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
CPPFLAGS := $(PRE_CFLAGS) $(CPPFLAGS)
KBUILD_EXTRA_SYMBOLS=$(src)/../../scst/src/Module.symvers \
$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
[ -e $$d ] || continue; echo $$d; break; done)
ccflags-y += -I$(src)/../../scst/include
#ccflags-y += -Wextra -Wno-unused-parameter