From 8be2424adf28ce235d8f7e6fef1055c54b17c152 Mon Sep 17 00:00:00 2001 From: Liu Xiaodong Date: Fri, 9 Oct 2020 16:40:26 -0400 Subject: [PATCH] mk: link blobfs_bdev library into applications With blobfs_bdev linked into applications, targets can work with blobfs related RPCf methods. Fixes issue: #1547 Change-Id: Ie501cd4d8d1c87380b78b54864003f45e0c2edc7 Signed-off-by: Liu Xiaodong Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4577 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- mk/spdk.modules.mk | 2 +- test/app/bdev_svc/Makefile | 7 +------ test/blobfs/fuse/Makefile | 5 +---- test/blobfs/mkfs/Makefile | 7 +------ 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk index 894c27031..2e3f18755 100644 --- a/mk/spdk.modules.mk +++ b/mk/spdk.modules.mk @@ -34,7 +34,7 @@ BLOCKDEV_MODULES_LIST = bdev_malloc bdev_null bdev_nvme bdev_passthru bdev_lvol BLOCKDEV_MODULES_LIST += bdev_raid bdev_error bdev_gpt bdev_split bdev_delay BLOCKDEV_MODULES_LIST += bdev_zone_block -BLOCKDEV_MODULES_LIST += blobfs blob_bdev blob lvol vmd nvme +BLOCKDEV_MODULES_LIST += blobfs blobfs_bdev blob_bdev blob lvol vmd nvme ifeq ($(CONFIG_CRYPTO),y) BLOCKDEV_MODULES_LIST += bdev_crypto diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 5ef0dfc79..2427f90cf 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -41,7 +41,7 @@ C_SRCS := bdev_svc.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) -SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json sock blobfs_bdev +SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json sock SPDK_LIB_LIST += notify ifeq ($(OS),Linux) @@ -55,9 +55,4 @@ endif SYS_LIBS += -lufc endif -# libfuse3 is required internally by blobfs_bdev -ifeq ($(CONFIG_FUSE),y) -LIBS+= -L/usr/local/lib -lfuse3 -endif - include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile index 09d956e4f..88835cdae 100644 --- a/test/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -42,9 +42,6 @@ C_SRCS := fuse.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ - log jsonrpc json rpc sock notify blobfs_bdev - -# libfuse3 is required internally by blobfs_bdev -LIBS+= -L/usr/local/lib -lfuse3 + log jsonrpc json rpc sock notify include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile index 42eebd9f1..52bf45abc 100644 --- a/test/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -42,11 +42,6 @@ C_SRCS := mkfs.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ - log jsonrpc json rpc sock notify blobfs_bdev - -# libfuse3 is required internally by blobfs_bdev -ifeq ($(CONFIG_FUSE),y) -LIBS+= -L/usr/local/lib -lfuse3 -endif + log jsonrpc json rpc sock notify include $(SPDK_ROOT_DIR)/mk/spdk.app.mk