ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove sock from SOCK_MODULES_LIST

Browse Source 
The various *_MODULES_LIST are intended for the modules
that implement the specific interface - not for the
associated core library itself.

For example, BLOCKDEV_MODULES_LIST doesn't contain bdev,
it contains all of the bdev modules.  Similar for
COPY_MODULES_LIST and copy.

So make SOCK_MODULES_LIST consistent.  This is a real
pain because we have to add sock explicitly to a bunch
of individual Makefiles, but I have plans to clean that
up in some future patches.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I0d293372cfb38bfa46c8478a8d9ca9ce23924747

Reviewed-on: https://review.gerrithub.io/434125
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2018-11-20 09:10:20 -07:00 committed by Darek Stojaczyk
parent 2bebd09bd7
commit 0b5fa082db
12 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/iscsi_tgt/Makefile
View File

@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c
SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf
SPDK_LIB_LIST += thread util log log_rpc app_rpc net SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd

2
app/nvmf_tgt/Makefile
View File

@ -41,7 +41,7 @@ APP = nvmf_tgt
C_SRCS := nvmf_main.c C_SRCS := nvmf_main.c
SPDK_LIB_LIST = event_bdev event_copy event_nvmf SPDK_LIB_LIST = event_bdev event_copy event_nvmf
SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json sock
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
ifeq ($(OS),Linux) ifeq ($(OS),Linux)

2
app/spdk_tgt/Makefile
View File

@ -50,7 +50,7 @@ endif
SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event
SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd

2
app/vhost/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIB_LIST = vhost rte_vhost event_vhost
SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf
SPDK_LIB_LIST += thread util log log_rpc app_rpc SPDK_LIB_LIST += thread util log log_rpc app_rpc
SPDK_LIB_LIST += event_nbd nbd net SPDK_LIB_LIST += event_nbd nbd net sock
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \

2
examples/bdev/hello_world/Makefile
View File

@ -39,7 +39,7 @@ APP = hello_bdev
C_SRCS := hello_bdev.c C_SRCS := hello_bdev.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc sock
LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

2
examples/blob/cli/Makefile
View File

@ -40,7 +40,7 @@ C_SRCS := blobcli.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc log jsonrpc json rpc sock
# Don't link bdev_lvol in blobcli - otherwise this utility cannot operate on an lvolstore # Don't link bdev_lvol in blobcli - otherwise this utility cannot operate on an lvolstore
BLOCKDEV_MODULES_LIST := $(filter-out bdev_lvol,$(BLOCKDEV_MODULES_LIST)) BLOCKDEV_MODULES_LIST := $(filter-out bdev_lvol,$(BLOCKDEV_MODULES_LIST))

2
examples/blob/hello_world/Makefile
View File

@ -40,7 +40,7 @@ C_SRCS := hello_blob.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc log jsonrpc json rpc sock
LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

2
examples/sock/hello_world/Makefile
View File

@ -38,7 +38,7 @@ APP = hello_sock
C_SRCS := hello_sock.c C_SRCS := hello_sock.c
SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc sock
LIBS += $(SOCK_MODULES_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) LIBS += $(SOCK_MODULES_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

3
mk/spdk.modules.mk
View File

@ -66,8 +66,7 @@ BLOCKDEV_MODULES_LIST += bdev_pmem
BLOCKDEV_MODULES_DEPS += -lpmemblk BLOCKDEV_MODULES_DEPS += -lpmemblk
endif endif
SOCK_MODULES_LIST = sock SOCK_MODULES_LIST = sock_posix
SOCK_MODULES_LIST += sock_posix
ifeq ($(CONFIG_VPP),y) ifeq ($(CONFIG_VPP),y)
ifneq ($(CONFIG_VPP_DIR),) ifneq ($(CONFIG_VPP_DIR),)

2
test/app/bdev_svc/Makefile
View File

@ -41,7 +41,7 @@ APP = bdev_svc
C_SRCS := bdev_svc.c C_SRCS := bdev_svc.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json sock
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
ifeq ($(OS),Linux) ifeq ($(OS),Linux)

2
test/bdev/bdevio/Makefile
View File

@ -41,7 +41,7 @@ APP = bdevio
C_SRCS := bdevio.c C_SRCS := bdevio.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \

2
test/bdev/bdevperf/Makefile
View File

@ -41,7 +41,7 @@ APP = bdevperf
C_SRCS := bdevperf.c C_SRCS := bdevperf.c
SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \