make: rev SO versions individually for libraries.

This will allow us to keep track of compatibility issues on a per-library basis. Change-Id: Ib0c796adb1efe1570212a503ed660bef6f142b6e Signed-off-by: Seth Howell <seth.howell@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1067 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-02-28 13:47:11 -07:00 · 2020-02-28 13:47:11 -07:00 · 193927830d
commit 193927830d
parent 5e2101ceb2
73 changed files with 287 additions and 10 deletions
--- a/lib/accel/Makefile
+++ b/lib/accel/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = accel
 C_SRCS = accel_engine.c accel_engine_rpc.c

--- a/lib/bdev/Makefile
+++ b/lib/bdev/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 ifeq ($(CONFIG_VTUNE),y)
 CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify
 endif
--- a/lib/blob/Makefile
+++ b/lib/blob/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c
 LIBNAME = blob

--- a/lib/blobfs/Makefile
+++ b/lib/blobfs/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = blobfs.c tree.c
 LIBNAME = blobfs

--- a/lib/conf/Makefile
+++ b/lib/conf/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = conf.c
 LIBNAME = conf

--- a/lib/env_dpdk/Makefile
+++ b/lib/env_dpdk/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += $(ENV_CFLAGS)
 C_SRCS = env.c memory.c pci.c init.c threads.c
 C_SRCS += pci_nvme.c pci_ioat.c pci_virtio.c pci_vmd.c
--- a/lib/event/Makefile
+++ b/lib/event/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = event
 C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c

--- a/lib/ftl/Makefile
+++ b/lib/ftl/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_reloc.c \
 	 ftl_restore.c ftl_init.c ftl_trace.c

--- a/lib/ioat/Makefile
+++ b/lib/ioat/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = ioat.c
 LIBNAME = ioat

--- a/lib/iscsi/Makefile
+++ b/lib/iscsi/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS = conn.c \
 	 init_grp.c iscsi.c md5.c param.c portal_grp.c \
--- a/lib/json/Makefile
+++ b/lib/json/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = json_parse.c json_util.c json_write.c
 LIBNAME = json

--- a/lib/jsonrpc/Makefile
+++ b/lib/jsonrpc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = jsonrpc
 C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c
 C_SRCS += jsonrpc_client.c jsonrpc_client_tcp.c
--- a/lib/log/Makefile
+++ b/lib/log/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = log.c log_flags.c
 LIBNAME = log
 ifeq ($(CONFIG_LOG_BACKTRACE),y)
--- a/lib/log_rpc/Makefile
+++ b/lib/log_rpc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = log_rpc.c
 LIBNAME = log_rpc

--- a/lib/lvol/Makefile
+++ b/lib/lvol/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = lvol.c
 LIBNAME = lvol

--- a/lib/nbd/Makefile
+++ b/lib/nbd/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = nbd
 C_SRCS = nbd.c nbd_rpc.c

--- a/lib/net/Makefile
+++ b/lib/net/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = interface.c net_rpc.c

 LIBNAME = net
--- a/lib/notify/Makefile
+++ b/lib/notify/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = notify.c notify_rpc.c
 LIBNAME = notify

--- a/lib/nvme/Makefile
+++ b/lib/nvme/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c nvme_ns.c nvme_pcie.c nvme_qpair.c nvme.c nvme_quirks.c nvme_transport.c nvme_uevent.c nvme_ctrlr_ocssd_cmd.c \
 	nvme_ns_ocssd_cmd.c nvme_tcp.c nvme_opal.c nvme_io_msg.c
 C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \
 	 subsystem.c nvmf.c nvmf_rpc.c transport.c tcp.c

--- a/lib/reduce/Makefile
+++ b/lib/reduce/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = reduce.c
 LIBNAME = reduce

--- a/lib/rpc/Makefile
+++ b/lib/rpc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = rpc.c
 LIBNAME = rpc

--- a/lib/rte_vhost/Makefile
+++ b/lib/rte_vhost/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I.
 CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -include rte_config.h
--- a/lib/scsi/Makefile
+++ b/lib/scsi/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = dev.c lun.c port.c scsi.c scsi_bdev.c scsi_pr.c scsi_rpc.c task.c
 LIBNAME = scsi

--- a/lib/sock/Makefile
+++ b/lib/sock/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = sock.c net_framework.c

 LIBNAME = sock
--- a/lib/thread/Makefile
+++ b/lib/thread/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = thread.c
 LIBNAME = thread

--- a/lib/trace/Makefile
+++ b/lib/trace/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = trace.c trace_flags.c trace_rpc.c
 LIBNAME = trace

--- a/lib/ut_mock/Makefile
+++ b/lib/ut_mock/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = mock.c
 LIBNAME = ut_mock

--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c \
 	 dif.c fd.c file.c iov.c math.c pipe.c strerror_tls.c string.c uuid.c
 LIBNAME = util
--- a/lib/vhost/Makefile
+++ b/lib/vhost/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I.
 CFLAGS += $(ENV_CFLAGS)

--- a/lib/virtio/Makefile
+++ b/lib/virtio/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += $(ENV_CFLAGS)
 C_SRCS = virtio.c virtio_user.c virtio_pci.c
 C_SRCS += virtio_user/vhost_user.c
--- a/lib/vmd/Makefile
+++ b/lib/vmd/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vmd.c led.c
 LIBNAME = vmd

--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@ -263,17 +263,10 @@ LINK_CXX=\
 	$(Q)echo "  LINK $S/$@"; \
 	$(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LINKER_ARGS) $(SYS_LIBS)

-#
-# Variables to use for versioning shared libs
-#
-SO_VER := 2
-SO_MINOR := 0
-SO_SUFFIX_ALL := $(SO_VER).$(SO_MINOR)
-
 # Provide function to ease build of a shared lib
 define spdk_build_realname_shared_lib
 	$(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \
-	    -Wl,--soname,$(patsubst %.so.$(SO_SUFFIX_ALL),%.so.$(SO_SUFFIX_ALL),$(notdir $@)) \
+	    -Wl,--soname,$(notdir $@) \
 	    -Wl,--whole-archive $(1) -Wl,--no-whole-archive \
 	    -Wl,--version-script=$(2) \
 	    $(3)
--- a/mk/spdk.lib.mk
+++ b/mk/spdk.lib.mk
@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk
 SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map
 LIB := $(call spdk_lib_list_to_static_libs,$(LIBNAME))
 SHARED_LINKED_LIB := $(LIB:.a=.so)
-SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX_ALL))
+SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX))

 ifeq ($(CONFIG_SHARED),y)
 DEP := $(SHARED_LINKED_LIB)
--- a/module/accel/ioat/Makefile
+++ b/module/accel/ioat/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = accel_ioat
 C_SRCS = accel_engine_ioat.c accel_engine_ioat_rpc.c

--- a/module/bdev/aio/Makefile
+++ b/module/bdev/aio/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_aio.c bdev_aio_rpc.c
 LIBNAME = bdev_aio
 LOCAL_SYS_LIBS = -laio
--- a/module/bdev/compress/Makefile
+++ b/module/bdev/compress/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/

 C_SRCS = vbdev_compress.c vbdev_compress_rpc.c
--- a/module/bdev/crypto/Makefile
+++ b/module/bdev/crypto/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += $(ENV_CFLAGS)

 C_SRCS = vbdev_crypto.c vbdev_crypto_rpc.c
--- a/module/bdev/delay/Makefile
+++ b/module/bdev/delay/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/

 C_SRCS = vbdev_delay.c vbdev_delay_rpc.c
--- a/module/bdev/error/Makefile
+++ b/module/bdev/error/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vbdev_error.c vbdev_error_rpc.c
 LIBNAME = bdev_error

--- a/module/bdev/ftl/Makefile
+++ b/module/bdev/ftl/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS += bdev_ftl.c bdev_ftl_rpc.c
 LIBNAME = bdev_ftl

--- a/module/bdev/gpt/Makefile
+++ b/module/bdev/gpt/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = gpt.c vbdev_gpt.c
 LIBNAME = bdev_gpt

--- a/module/bdev/iscsi/Makefile
+++ b/module/bdev/iscsi/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 # CentOS 7 libiscsi package has functions declared inline but not
 # defined in the header file.  Not aware of any way to disable
--- a/module/bdev/lvol/Makefile
+++ b/module/bdev/lvol/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c
 LIBNAME = bdev_lvol
 LOCAL_SYS_LIBS = -luuid
--- a/module/bdev/malloc/Makefile
+++ b/module/bdev/malloc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_malloc.c bdev_malloc_rpc.c
 LIBNAME = bdev_malloc
 LOCAL_SYS_LIBS = -luuid
--- a/module/bdev/null/Makefile
+++ b/module/bdev/null/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_null.c bdev_null_rpc.c
 LIBNAME = bdev_null

--- a/module/bdev/nvme/Makefile
+++ b/module/bdev/nvme/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c bdev_ocssd.c bdev_ocssd_rpc.c
 C_SRCS-$(CONFIG_NVME_CUSE) += bdev_nvme_cuse_rpc.c

--- a/module/bdev/ocf/Makefile
+++ b/module/bdev/ocf/Makefile
@ -35,6 +35,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)

 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/env_ocf -I$(SPDK_ROOT_DIR)/lib/env_ocf/include
 C_SRCS = $(shell ls *.c)

--- a/module/bdev/passthru/Makefile
+++ b/module/bdev/passthru/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/

 C_SRCS = vbdev_passthru.c vbdev_passthru_rpc.c
--- a/module/bdev/pmem/Makefile
+++ b/module/bdev/pmem/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_pmem.c bdev_pmem_rpc.c
 LIBNAME = bdev_pmem

--- a/module/bdev/raid/Makefile
+++ b/module/bdev/raid/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = bdev_raid.c bdev_raid_rpc.c raid0.c

--- a/module/bdev/rbd/Makefile
+++ b/module/bdev/rbd/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_rbd.c bdev_rbd_rpc.c
 LIBNAME = bdev_rbd

--- a/module/bdev/rpc/Makefile
+++ b/module/bdev/rpc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_rpc.c
 LIBNAME = bdev_rpc

--- a/module/bdev/split/Makefile
+++ b/module/bdev/split/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vbdev_split.c vbdev_split_rpc.c
 LIBNAME = bdev_split

--- a/module/bdev/uring/Makefile
+++ b/module/bdev/uring/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_uring.c bdev_uring_rpc.c
 LIBNAME = bdev_uring
 LOCAL_SYS_LIBS = -luring
--- a/module/bdev/virtio/Makefile
+++ b/module/bdev/virtio/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c
 LIBNAME = bdev_virtio

--- a/module/bdev/zone_block/Makefile
+++ b/module/bdev/zone_block/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vbdev_zone_block.c vbdev_zone_block_rpc.c
 LIBNAME = bdev_zone_block

--- a/module/blob/bdev/Makefile
+++ b/module/blob/bdev/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = blob_bdev.c
 LIBNAME = blob_bdev

--- a/module/blobfs/bdev/Makefile
+++ b/module/blobfs/bdev/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = blobfs_bdev.c blobfs_bdev_rpc.c

 # libfuse3 is required by blobfs_fuse.c
--- a/module/env_dpdk/Makefile
+++ b/module/env_dpdk/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = env_dpdk_rpc.c
 LIBNAME = env_dpdk_rpc

--- a/module/event/rpc/Makefile
+++ b/module/event/rpc/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = app_rpc.c subsystem_rpc.c
 LIBNAME = app_rpc

--- a/module/event/subsystems/accel/Makefile
+++ b/module/event/subsystems/accel/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = accel.c
 LIBNAME = event_accel

--- a/module/event/subsystems/bdev/Makefile
+++ b/module/event/subsystems/bdev/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = bdev.c
 LIBNAME = event_bdev

--- a/module/event/subsystems/iscsi/Makefile
+++ b/module/event/subsystems/iscsi/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS = iscsi.c
 LIBNAME = event_iscsi
--- a/module/event/subsystems/nbd/Makefile
+++ b/module/event/subsystems/nbd/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = nbd.c
 LIBNAME = event_nbd

--- a/module/event/subsystems/net/Makefile
+++ b/module/event/subsystems/net/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = net.c
 LIBNAME = event_net

--- a/module/event/subsystems/nvmf/Makefile
+++ b/module/event/subsystems/nvmf/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = conf.c nvmf_rpc.c nvmf_tgt.c
 LIBNAME = event_nvmf

--- a/module/event/subsystems/scsi/Makefile
+++ b/module/event/subsystems/scsi/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = scsi.c
 LIBNAME = event_scsi

--- a/module/event/subsystems/vhost/Makefile
+++ b/module/event/subsystems/vhost/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vhost.c
 LIBNAME = event_vhost

--- a/module/event/subsystems/vmd/Makefile
+++ b/module/event/subsystems/vmd/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS = vmd.c vmd_rpc.c
 LIBNAME = event_vmd

--- a/module/sock/posix/Makefile
+++ b/module/sock/posix/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 LIBNAME = sock_posix
 C_SRCS = posix.c

--- a/module/sock/vpp/Makefile
+++ b/module/sock/vpp/Makefile
@ -34,6 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 C_SRCS += vpp.c
 CFLAGS += -Wno-sign-compare -Wno-error=old-style-definition
 CFLAGS += -Wno-error=strict-prototypes -Wno-error=ignored-qualifiers
--- a/shared_lib/Makefile
+++ b/shared_lib/Makefile
@ -36,9 +36,13 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk

+SO_VER := 2
+SO_MINOR := 0
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
+
 # Build combined libspdk.so shared library
 SHARED_LINKED_LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk.so
-SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX_ALL)
+SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX)
 IGNORED_LIBS := libspdk.so
 IGNORED_LIBS += libspdk_ut_mock.so
 IGNORED_LIBS += libspdk_env_dpdk.so