diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk index 592304a7f..ef77a6ab5 100644 --- a/mk/spdk.lib_deps.mk +++ b/mk/spdk.lib_deps.mk @@ -163,12 +163,12 @@ DEPDIRS-event_accel := accel event DEPDIRS-event_net := sock net event DEPDIRS-event_vmd := vmd conf $(JSON_LIBS) event log thread -DEPDIRS-event_bdev := bdev event event_accel event_vmd +DEPDIRS-event_bdev := bdev event event_accel event_vmd event_sock DEPDIRS-event_nbd := event nbd event_bdev -DEPDIRS-event_nvmf := $(BDEV_DEPS_CONF_THREAD) event nvme nvmf event_bdev +DEPDIRS-event_nvmf := $(BDEV_DEPS_CONF_THREAD) event nvme nvmf event_bdev event_sock DEPDIRS-event_scsi := event scsi event_bdev -DEPDIRS-event_iscsi := event iscsi event_scsi +DEPDIRS-event_iscsi := event iscsi event_scsi event_sock DEPDIRS-event_vhost := event vhost event_scsi DEPDIRS-event_sock := event diff --git a/module/event/subsystems/Makefile b/module/event/subsystems/Makefile index e833b0dbd..a78985ec3 100644 --- a/module/event/subsystems/Makefile +++ b/module/event/subsystems/Makefile @@ -46,7 +46,7 @@ DIRS-$(CONFIG_VHOST) += vhost # the subsystem dependency tree defined within the event subsystem C files # themselves. Should that tree change, these dependencies should change # accordingly. -DEPDIRS-bdev := accel vmd +DEPDIRS-bdev := accel vmd sock DEPDIRS-iscsi := scsi DEPDIRS-nbd := bdev DEPDIRS-nvmf := bdev diff --git a/module/event/subsystems/bdev/bdev.c b/module/event/subsystems/bdev/bdev.c index a7926f936..5776cf273 100644 --- a/module/event/subsystems/bdev/bdev.c +++ b/module/event/subsystems/bdev/bdev.c @@ -81,3 +81,4 @@ static struct spdk_subsystem g_spdk_subsystem_bdev = { SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_bdev); SPDK_SUBSYSTEM_DEPEND(bdev, accel) SPDK_SUBSYSTEM_DEPEND(bdev, vmd) +SPDK_SUBSYSTEM_DEPEND(bdev, sock) diff --git a/module/event/subsystems/iscsi/iscsi.c b/module/event/subsystems/iscsi/iscsi.c index 1fa3e915c..cecefd0a5 100644 --- a/module/event/subsystems/iscsi/iscsi.c +++ b/module/event/subsystems/iscsi/iscsi.c @@ -77,3 +77,4 @@ static struct spdk_subsystem g_spdk_subsystem_iscsi = { SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_iscsi); SPDK_SUBSYSTEM_DEPEND(iscsi, scsi) +SPDK_SUBSYSTEM_DEPEND(iscsi, sock) diff --git a/module/event/subsystems/nvmf/nvmf_tgt.c b/module/event/subsystems/nvmf/nvmf_tgt.c index 8227a86fd..0ffac50c6 100644 --- a/module/event/subsystems/nvmf/nvmf_tgt.c +++ b/module/event/subsystems/nvmf/nvmf_tgt.c @@ -473,3 +473,4 @@ static struct spdk_subsystem g_spdk_subsystem_nvmf = { SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_nvmf) SPDK_SUBSYSTEM_DEPEND(nvmf, bdev) +SPDK_SUBSYSTEM_DEPEND(nvmf, sock) diff --git a/test/external_code/hello_world/Makefile b/test/external_code/hello_world/Makefile index 224d5cc4d..9cdbd4664 100644 --- a/test/external_code/hello_world/Makefile +++ b/test/external_code/hello_world/Makefile @@ -52,7 +52,7 @@ alone_shared_iso: # Shows how to compile an external application against the SPDK archives. alone_static: $(CC) $(COMMON_CFLAGS) -o hello_bdev ./hello_bdev.c -Wl,--whole-archive -lspdk_bdev_malloc -lspdk_event_bdev -lspdk_event_accel -lspdk_event_vmd \ - -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace -lspdk_log -lspdk_json \ + -lspdk_event_sock -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace -lspdk_log -lspdk_json \ -lspdk_jsonrpc -lspdk_rpc -lspdk_sock -lspdk_notify -lspdk_vmd -lspdk_env_dpdk -lrte_eal -lrte_mempool -lrte_ring \ -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash \ -lrte_cryptodev -Wl,--no-whole-archive -lnuma -luuid -lpthread -ldl -lrt @@ -60,7 +60,7 @@ alone_static: # Shows how to compile and external bdev and application sgainst the SPDK archives. bdev_static: $(CC) $(COMMON_CFLAGS) -L../passthru -o hello_bdev ./hello_bdev.c -Wl,--whole-archive -lpassthru_external -lspdk_bdev_malloc -lspdk_event_bdev \ - -lspdk_event_accel -lspdk_event_vmd -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace \ + -lspdk_event_accel -lspdk_event_vmd -lspdk_event_sock -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace \ -lspdk_log -lspdk_json -lspdk_jsonrpc -lspdk_rpc -lspdk_sock -lspdk_notify -lspdk_vmd -lspdk_env_dpdk -lrte_eal -lrte_mempool \ -lrte_ring -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash -lrte_cryptodev \ -Wl,--no-whole-archive -lnuma -luuid -lpthread -ldl -lrt