From 0b5fa082db129ca2e1bbac69bea617ac361a05c3 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 09:10:20 -0700 Subject: [PATCH] build: remove sock from SOCK_MODULES_LIST 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 Change-Id: I0d293372cfb38bfa46c8478a8d9ca9ce23924747 Reviewed-on: https://review.gerrithub.io/434125 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto --- app/iscsi_tgt/Makefile | 2 +- app/nvmf_tgt/Makefile | 2 +- app/spdk_tgt/Makefile | 2 +- app/vhost/Makefile | 2 +- examples/bdev/hello_world/Makefile | 2 +- examples/blob/cli/Makefile | 2 +- examples/blob/hello_world/Makefile | 2 +- examples/sock/hello_world/Makefile | 2 +- mk/spdk.modules.mk | 3 +-- test/app/bdev_svc/Makefile | 2 +- test/bdev/bdevio/Makefile | 2 +- test/bdev/bdevperf/Makefile | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index 5fc7dd42f..2d5246f86 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -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 += 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) SPDK_LIB_LIST += event_nbd nbd diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index e93ed1bf0..8fdbd0cc2 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -41,7 +41,7 @@ APP = nvmf_tgt C_SRCS := nvmf_main.c 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 ifeq ($(OS),Linux) diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile index cfb1bb3ad..cc0666049 100644 --- a/app/spdk_tgt/Makefile +++ b/app/spdk_tgt/Makefile @@ -50,7 +50,7 @@ endif 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 += app_rpc log_rpc bdev_rpc net +SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd diff --git a/app/vhost/Makefile b/app/vhost/Makefile index 51437ac2e..39132fe10 100644 --- a/app/vhost/Makefile +++ b/app/vhost/Makefile @@ -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 += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf 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) \ $(COPY_MODULES_LINKER_ARGS) \ diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile index dacc1b81b..1965e296b 100644 --- a/examples/bdev/hello_world/Makefile +++ b/examples/bdev/hello_world/Makefile @@ -39,7 +39,7 @@ APP = hello_bdev C_SRCS := hello_bdev.c 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 += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index 2a454cd2b..cfde82ea4 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -40,7 +40,7 @@ C_SRCS := blobcli.c SPDK_LIB_LIST = event_bdev event_copy 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 BLOCKDEV_MODULES_LIST := $(filter-out bdev_lvol,$(BLOCKDEV_MODULES_LIST)) diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index 54b55e7f6..aa9dbced3 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -40,7 +40,7 @@ C_SRCS := hello_blob.c SPDK_LIB_LIST = event_bdev event_copy 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 += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) diff --git a/examples/sock/hello_world/Makefile b/examples/sock/hello_world/Makefile index f638153cf..575de2f7e 100644 --- a/examples/sock/hello_world/Makefile +++ b/examples/sock/hello_world/Makefile @@ -38,7 +38,7 @@ APP = hello_sock 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) diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk index 0842ab368..b73812550 100644 --- a/mk/spdk.modules.mk +++ b/mk/spdk.modules.mk @@ -66,8 +66,7 @@ BLOCKDEV_MODULES_LIST += bdev_pmem BLOCKDEV_MODULES_DEPS += -lpmemblk endif -SOCK_MODULES_LIST = sock -SOCK_MODULES_LIST += sock_posix +SOCK_MODULES_LIST = sock_posix ifeq ($(CONFIG_VPP),y) ifneq ($(CONFIG_VPP_DIR),) diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 43ec095ac..b97dcee49 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -41,7 +41,7 @@ APP = bdev_svc C_SRCS := bdev_svc.c 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 ifeq ($(OS),Linux) diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index d973846f6..8e762f0bc 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -41,7 +41,7 @@ APP = bdevio C_SRCS := bdevio.c 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) \ $(COPY_MODULES_LINKER_ARGS) \ diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile index eb5f76aef..9c3155238 100644 --- a/test/bdev/bdevperf/Makefile +++ b/test/bdev/bdevperf/Makefile @@ -41,7 +41,7 @@ APP = bdevperf C_SRCS := bdevperf.c 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) \ $(COPY_MODULES_LINKER_ARGS) \