mk/lib: add a check that major and minor version is set for libs.

Also, while we are here, consolidate setting SO_SUFFIX to one spot. Previously, it was possible for a library to slip through without an SO version. Signed-off-by: Seth Howell <[email protected]> Change-Id: I4db5fa5839502d266c6259892e5719b05134518c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2361 Tested-by: SPDK CI Jenkins <[email protected]> Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Paul Luse <[email protected]> Reviewed-by: Ben Walker <[email protected]> Reviewed-by: Aleksey Marchuk <[email protected]> Reviewed-by: Tomasz Zawadzki <[email protected]>
miaodafei · May 21, 2020 · d18e632 · d18e632
1 parent 2c56786
commit d18e632
Show file tree

Hide file tree

Showing 76 changed files with 10 additions and 75 deletions.
diff --git a/lib/accel/Makefile b/lib/accel/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 2
 SO_MINOR := 3
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 LIBNAME = accel
 C_SRCS = accel_engine.c

diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/blob/Makefile b/lib/blob/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c
 LIBNAME = blob

diff --git a/lib/blobfs/Makefile b/lib/blobfs/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = blobfs.c tree.c
 LIBNAME = blobfs

diff --git a/lib/conf/Makefile b/lib/conf/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 CFLAGS += $(ENV_CFLAGS)
 C_SRCS = env.c memory.c pci.c init.c threads.c

diff --git a/lib/event/Makefile b/lib/event/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 LIBNAME = event
 C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c

diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/idxd/Makefile b/lib/idxd/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 2
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = idxd.c
 LIBNAME = idxd

diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS = conn.c \

diff --git a/lib/json/Makefile b/lib/json/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/log/Makefile b/lib/log/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 2
 SO_MINOR := 1
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = log.c log_flags.c
 LIBNAME = log

diff --git a/lib/log_rpc/Makefile b/lib/log_rpc/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/net/Makefile b/lib/net/Makefile
@@ -36,7 +36,6 @@ 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
 

diff --git a/lib/notify/Makefile b/lib/notify/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 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 nvme_poll_group.c

diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 4
 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

diff --git a/lib/rdma/Makefile b/lib/rdma/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 1
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_rdma.map)
 

diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/rte_vhost/Makefile b/lib/rte_vhost/Makefile
@@ -36,7 +36,6 @@ 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)

diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 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

diff --git a/lib/sock/Makefile b/lib/sock/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = sock.c net_framework.c
 

diff --git a/lib/thread/Makefile b/lib/thread/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 C_SRCS = thread.c
 LIBNAME = thread

diff --git a/lib/trace/Makefile b/lib/trace/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/util/Makefile b/lib/util/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 3
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 CFLAGS += -I.
 CFLAGS += $(ENV_CFLAGS)

diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk
@@ -38,6 +38,16 @@ ifeq ($(SPDK_MAP_FILE),)
 $(error SPDK_MAP_FILE is not set for lib $(LIBNAME))
 endif
 
+ifeq ($(SO_VER),)
+$(error SO major version is not set for lib $(LIBNAME))
+endif
+
+ifeq ($(SO_MINOR),)
+$(error SO minor version is not set for lib $(LIBNAME))
+endif
+
+
+SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 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))

diff --git a/module/accel/idxd/Makefile b/module/accel/idxd/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 1
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 LIBNAME = accel_idxd
 C_SRCS = accel_engine_idxd.c accel_engine_idxd_rpc.c

diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile
@@ -36,7 +36,6 @@ 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/
 

diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile
@@ -36,7 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SO_VER := 2
 SO_MINOR := 0
-SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 
 CFLAGS += $(ENV_CFLAGS)
 

diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile
@@ -36,7 +36,6 @@ 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/
 

diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile
@@ -36,7 +36,6 @@ 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

diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile
@@ -36,7 +36,6 @@ 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