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

modules: rename NET_MODULES_* -> SOCK_MODULES_*

Browse Source 
Also remove libspdk_net from the list and add it to each app that
originally linked it via NET_MODULES.

This will allow the use of SOCK_MODULES in application Makefiles without
pulling in the RPC libraries required by spdk_net.

Change-Id: Iad68ddd25bea24bba53a681c78d41e6e703f866d
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/416476
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Daniel Verkamp 2018-06-21 16:30:52 -07:00 committed by Jim Harris
parent ea3c58ea77
commit 64823f28a8
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi
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 event app_rpc SPDK_LIB_LIST += thread util log log_rpc event app_rpc net
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
@ -54,14 +54,14 @@ endif
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \
$(NET_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
all : $(APP) all : $(APP)
@: @:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
$(LINK_C) $(LINK_C)
clean : clean :

6
app/spdk_tgt/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS := spdk_tgt.c
SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf
SPDK_LIB_LIST += nvmf event log trace conf thread util bdev iscsi scsi copy rpc jsonrpc json SPDK_LIB_LIST += nvmf event log trace conf thread util bdev iscsi scsi copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
@ -55,13 +55,13 @@ endif
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \
$(NET_MODULES_LINKER_ARGS) \ $(SOCK_MODULES_LINKER_ARGS) \
$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all: $(APP) all: $(APP)
@: @:
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
$(LINK_C) $(LINK_C)
clean: clean:

6
app/vhost/Makefile
View File

@ -43,18 +43,18 @@ C_SRCS := vhost.c
SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost
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 event app_rpc SPDK_LIB_LIST += thread util log log_rpc event app_rpc
SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd net
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \
$(NET_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
all : $(APP) all : $(APP)
@: @:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
$(LINK_C) $(LINK_C)
clean : clean :

20
mk/spdk.modules.mk
View File

@ -62,17 +62,17 @@ BLOCKDEV_MODULES_LIST += bdev_pmem
BLOCKDEV_MODULES_DEPS += -lpmemblk BLOCKDEV_MODULES_DEPS += -lpmemblk
endif endif
NET_MODULES_LIST = net sock SOCK_MODULES_LIST = sock
NET_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),)
NET_MODULES_DEPS = -l:libvppinfra.a -l:libsvm.a -l:libvapiclient.a SOCK_MODULES_DEPS = -l:libvppinfra.a -l:libsvm.a -l:libvapiclient.a
NET_MODULES_DEPS += -l:libvppcom.a -l:libvlibmemoryclient.a SOCK_MODULES_DEPS += -l:libvppcom.a -l:libvlibmemoryclient.a
else else
NET_MODULES_DEPS = -lvppcom SOCK_MODULES_DEPS = -lvppcom
endif endif
NET_MODULES_LIST += sock_vpp SOCK_MODULES_LIST += sock_vpp
endif endif
COPY_MODULES_LIST = copy_ioat ioat COPY_MODULES_LIST = copy_ioat ioat
@ -99,9 +99,9 @@ COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \
COPY_MODULES_FILES = $(call spdk_lib_list_to_files,$(COPY_MODULES_LIST)) COPY_MODULES_FILES = $(call spdk_lib_list_to_files,$(COPY_MODULES_LIST))
NET_MODULES_LINKER_ARGS = -Wl,--whole-archive \ SOCK_MODULES_LINKER_ARGS = -Wl,--whole-archive \
$(NET_MODULES_LIST:%=-lspdk_%) \ $(SOCK_MODULES_LIST:%=-lspdk_%) \
$(NET_MODULES_DEPS) \ $(SOCK_MODULES_DEPS) \
-Wl,--no-whole-archive -Wl,--no-whole-archive
NET_MODULES_FILES = $(call spdk_lib_list_to_files,$(NET_MODULES_LIST)) SOCK_MODULES_FILES = $(call spdk_lib_list_to_files,$(SOCK_MODULES_LIST))

5
shared_lib/Makefile
View File

@ -57,6 +57,7 @@ SPDK_LIB_LIST += json
SPDK_LIB_LIST += jsonrpc SPDK_LIB_LIST += jsonrpc
SPDK_LIB_LIST += log SPDK_LIB_LIST += log
SPDK_LIB_LIST += log_rpc SPDK_LIB_LIST += log_rpc
SPDK_LIB_LIST += net
SPDK_LIB_LIST += nvmf SPDK_LIB_LIST += nvmf
SPDK_LIB_LIST += rpc SPDK_LIB_LIST += rpc
SPDK_LIB_LIST += scsi SPDK_LIB_LIST += scsi
@ -77,13 +78,13 @@ endif
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS)
LIBS += $(COPY_MODULES_LINKER_ARGS) LIBS += $(COPY_MODULES_LINKER_ARGS)
LIBS += $(NET_MODULES_LINKER_ARGS) LIBS += $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
comma := , comma := ,
$(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(MAKEFILE_LIST) spdk.map $(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(MAKEFILE_LIST) spdk.map
$(Q)echo " SO $(notdir $@)"; \ $(Q)echo " SO $(notdir $@)"; \
rm -f $@; \ rm -f $@; \
$(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \ $(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \