From 91003e528747f3cec18147274ec41b1f64d7ad7b Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 20 Mar 2020 10:54:15 -0700 Subject: [PATCH] make: don't link vpp into fio plugins. Signed-off-by: Seth Howell Change-Id: I96e29cd0681d767d22e31973950655b974ce9031 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1397 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu --- examples/bdev/fio_plugin/Makefile | 3 ++- mk/nvme.libtest.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile index 89e996866..f28aeef28 100644 --- a/examples/bdev/fio_plugin/Makefile +++ b/examples/bdev/fio_plugin/Makefile @@ -42,7 +42,8 @@ C_SRCS = fio_plugin.c CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR) LDFLAGS += -shared -rdynamic -Wl,-z,nodelete -SPDK_LIB_LIST = $(ALL_MODULES_LIST) +# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility) +SPDK_LIB_LIST = $(filter-out sock_vpp,$(ALL_MODULES_LIST)) SPDK_LIB_LIST += thread util bdev bdev_rpc conf accel rpc jsonrpc json log sock trace notify SPDK_LIB_LIST += event event_bdev event_accel event_vmd diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk index b226363ab..861ab6c17 100644 --- a/mk/nvme.libtest.mk +++ b/mk/nvme.libtest.mk @@ -38,7 +38,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk C_SRCS = $(APP:%=%.c) -SPDK_LIB_LIST = $(SOCK_MODULES_LIST) +# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility) +SPDK_LIB_LIST = $(filter-out sock_vpp,$(SOCK_MODULES_LIST)) SPDK_LIB_LIST += nvme thread util log sock vmd ifeq ($(CONFIG_RDMA),y)