From d18e63206a4b5d710756d7e7d9c42ef0db0c5d58 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 13:40:09 -0700 Subject: [PATCH] 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 Change-Id: I4db5fa5839502d266c6259892e5719b05134518c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2361 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk Reviewed-by: Tomasz Zawadzki --- lib/accel/Makefile | 1 - lib/bdev/Makefile | 1 - lib/blob/Makefile | 1 - lib/blobfs/Makefile | 1 - lib/conf/Makefile | 1 - lib/env_dpdk/Makefile | 1 - lib/event/Makefile | 1 - lib/ftl/Makefile | 1 - lib/idxd/Makefile | 1 - lib/ioat/Makefile | 1 - lib/iscsi/Makefile | 1 - lib/json/Makefile | 1 - lib/jsonrpc/Makefile | 1 - lib/log/Makefile | 1 - lib/log_rpc/Makefile | 1 - lib/lvol/Makefile | 1 - lib/nbd/Makefile | 1 - lib/net/Makefile | 1 - lib/notify/Makefile | 1 - lib/nvme/Makefile | 1 - lib/nvmf/Makefile | 1 - lib/rdma/Makefile | 1 - lib/reduce/Makefile | 1 - lib/rpc/Makefile | 1 - lib/rte_vhost/Makefile | 1 - lib/scsi/Makefile | 1 - lib/sock/Makefile | 1 - lib/thread/Makefile | 1 - lib/trace/Makefile | 1 - lib/ut_mock/Makefile | 1 - lib/util/Makefile | 1 - lib/vhost/Makefile | 1 - lib/virtio/Makefile | 1 - lib/vmd/Makefile | 1 - mk/spdk.lib.mk | 10 ++++++++++ module/accel/idxd/Makefile | 1 - module/accel/ioat/Makefile | 1 - module/bdev/aio/Makefile | 1 - module/bdev/compress/Makefile | 1 - module/bdev/crypto/Makefile | 1 - module/bdev/delay/Makefile | 1 - module/bdev/error/Makefile | 1 - module/bdev/ftl/Makefile | 1 - module/bdev/gpt/Makefile | 1 - module/bdev/iscsi/Makefile | 1 - module/bdev/lvol/Makefile | 1 - module/bdev/malloc/Makefile | 1 - module/bdev/null/Makefile | 1 - module/bdev/nvme/Makefile | 1 - module/bdev/ocf/Makefile | 1 - module/bdev/passthru/Makefile | 1 - module/bdev/pmem/Makefile | 1 - module/bdev/raid/Makefile | 1 - module/bdev/rbd/Makefile | 1 - module/bdev/rpc/Makefile | 1 - module/bdev/split/Makefile | 1 - module/bdev/uring/Makefile | 1 - module/bdev/virtio/Makefile | 1 - module/bdev/zone_block/Makefile | 1 - module/blob/bdev/Makefile | 1 - module/blobfs/bdev/Makefile | 1 - module/env_dpdk/Makefile | 1 - module/event/rpc/Makefile | 1 - module/event/subsystems/accel/Makefile | 1 - module/event/subsystems/bdev/Makefile | 1 - module/event/subsystems/iscsi/Makefile | 1 - module/event/subsystems/nbd/Makefile | 1 - module/event/subsystems/net/Makefile | 1 - module/event/subsystems/nvmf/Makefile | 1 - module/event/subsystems/scsi/Makefile | 1 - module/event/subsystems/vhost/Makefile | 1 - module/event/subsystems/vmd/Makefile | 1 - module/sock/posix/Makefile | 1 - module/sock/uring/Makefile | 1 - module/sock/vpp/Makefile | 1 - shared_lib/Makefile | 1 - 76 files changed, 10 insertions(+), 75 deletions(-) diff --git a/lib/accel/Makefile b/lib/accel/Makefile index 3d4f648c082..edea0fcfe95 100644 --- 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 index 430bcbac0c0..13d3aaa74ea 100644 --- 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 index 337295d8408..53ae6800b96 100644 --- 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 index 9a6b6cbad8a..d0c46de021b 100644 --- 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 index ef33eb04a20..667f72a13b8 100644 --- 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 index 8078d6495f2..147fd85c3f3 100644 --- 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 index 8925e168d05..9be0da3518e 100644 --- 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 index bbfb6cb51e8..c24274622e8 100644 --- 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 index 7e8a706f6c1..ed66aeb153f 100644 --- 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 index 2c90d0b9b30..a0da25b86b6 100644 --- 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 index 51e9fca4e52..2c663d880fe 100644 --- 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 index d618e1d03c3..91cb8868f00 100644 --- 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 index 38e8ae5fe46..7eb8dd68342 100644 --- 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 index a05aff98381..f6c03ca986d 100644 --- 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 index 1f90b23425b..2c7a78deb47 100644 --- 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 index 75d99ba5bad..c370a19a5d7 100644 --- 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 index c20cc744d11..69b13d133f1 100644 --- 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 index e4813dc13ff..918df6cfbe9 100644 --- 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 index 84d3f6e9a38..82249a5b271 100644 --- 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 index 3e18b44ae9b..91306f46ff1 100644 --- 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 index d3fe40c3dc3..e613a9a03cd 100644 --- 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 index fa37ab7d5dc..e6374557dfb 100644 --- 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 index 04c56b68308..fb417cd5744 100644 --- 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 index 903f9331127..ead36f6bafe 100644 --- 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 index 1543527108a..aa073c6caf2 100644 --- 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 index ecdba57d4a9..8f8a8c32667 100644 --- 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 index adcb6f3cbf2..553665f73da 100644 --- 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 index 524e1bf0dad..ceb7a394e7a 100644 --- 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 index 0ca721e5348..9102c320ac9 100644 --- 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 index 734237cd959..f4087807f83 100644 --- 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 index e49d449393d..23f8db6d002 100644 --- 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 index c554d237532..d887c9aaf75 100644 --- 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 index 15fcc46f79d..8af5d8bc518 100644 --- 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 index aee3cf69b4b..13813c55949 100644 --- 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 index b01e4b16bab..7dad8448a5a 100644 --- 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 index 68ff4956e22..f2540f900e7 100644 --- 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 index 14bd5ef05ad..0e43adbb1fa 100644 --- 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 index e710504e96f..9f0e3a58242 100644 --- 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 index 7ed20377531..e3d889e67f1 100644 --- 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 index 0af98701b83..dbf96952d27 100644 --- 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 index 80c5588fafb..f043ca5a8a0 100644 --- 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 index 3d4db1619ef..e67a1853044 100644 --- 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 index b720067e416..d0bfe10780a 100644 --- 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 index 9014c3ff187..db27dbc38bc 100644 --- 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 index 8411f160cdf..38ba8b70985 100644 --- 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 index 324f9306b39..37034593c12 100644 --- 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 index 1cc8f8949fd..c55db23ce7f 100644 --- 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 index 774e82c596a..e179b01ed8d 100644 --- 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 diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index f7da320dd89..f9ddb2389ef 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/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 = 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 diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index 496227bbefb..b931de10632 100644 --- a/module/bdev/ocf/Makefile +++ b/module/bdev/ocf/Makefile @@ -37,7 +37,6 @@ 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) diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile index 6a7c4722187..c12b976916a 100644 --- a/module/bdev/passthru/Makefile +++ b/module/bdev/passthru/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/pmem/Makefile b/module/bdev/pmem/Makefile index 05fee59a42d..3a918be7894 100644 --- a/module/bdev/pmem/Makefile +++ b/module/bdev/pmem/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_pmem.c bdev_pmem_rpc.c LIBNAME = bdev_pmem diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile index c996ee46017..452d32e7962 100644 --- a/module/bdev/raid/Makefile +++ b/module/bdev/raid/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/ C_SRCS = bdev_raid.c bdev_raid_rpc.c raid0.c diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index cf48a45cc90..055e14dac6f 100644 --- a/module/bdev/rbd/Makefile +++ b/module/bdev/rbd/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 = bdev_rbd.c bdev_rbd_rpc.c LIBNAME = bdev_rbd diff --git a/module/bdev/rpc/Makefile b/module/bdev/rpc/Makefile index 68b72921ee1..15de4fef938 100644 --- a/module/bdev/rpc/Makefile +++ b/module/bdev/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 = bdev_rpc.c LIBNAME = bdev_rpc diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile index b873d27139b..830224c6236 100644 --- a/module/bdev/split/Makefile +++ b/module/bdev/split/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_split.c vbdev_split_rpc.c LIBNAME = bdev_split diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile index 8190bf8bb52..2a97f156444 100644 --- a/module/bdev/uring/Makefile +++ b/module/bdev/uring/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_uring.c bdev_uring_rpc.c LIBNAME = bdev_uring diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile index 307ebfa3b7e..602927afe34 100644 --- a/module/bdev/virtio/Makefile +++ b/module/bdev/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) C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c LIBNAME = bdev_virtio diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile index c1a7c320019..3dec8a37d2f 100644 --- a/module/bdev/zone_block/Makefile +++ b/module/bdev/zone_block/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_zone_block.c vbdev_zone_block_rpc.c LIBNAME = bdev_zone_block diff --git a/module/blob/bdev/Makefile b/module/blob/bdev/Makefile index fb6e952ba99..c0ca6c6f63f 100644 --- a/module/blob/bdev/Makefile +++ b/module/blob/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) C_SRCS = blob_bdev.c LIBNAME = blob_bdev diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile index ff0df11c3d8..97d350d3099 100644 --- a/module/blobfs/bdev/Makefile +++ b/module/blobfs/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) C_SRCS = blobfs_bdev.c blobfs_bdev_rpc.c diff --git a/module/env_dpdk/Makefile b/module/env_dpdk/Makefile index fc708f38e61..6585c676a25 100644 --- a/module/env_dpdk/Makefile +++ b/module/env_dpdk/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 = env_dpdk_rpc.c LIBNAME = env_dpdk_rpc diff --git a/module/event/rpc/Makefile b/module/event/rpc/Makefile index 870d6c0bc29..1e620aa140a 100644 --- a/module/event/rpc/Makefile +++ b/module/event/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 = app_rpc.c subsystem_rpc.c LIBNAME = app_rpc diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile index bb186fd9b48..6c804598456 100644 --- a/module/event/subsystems/accel/Makefile +++ b/module/event/subsystems/accel/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 = accel.c LIBNAME = event_accel diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index 5392abef355..4503e327a3d 100644 --- a/module/event/subsystems/bdev/Makefile +++ b/module/event/subsystems/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) C_SRCS = bdev.c LIBNAME = event_bdev diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile index 05b3836b34b..f418f8bd966 100644 --- a/module/event/subsystems/iscsi/Makefile +++ b/module/event/subsystems/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 C_SRCS = iscsi.c diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index a8f48f85ee1..6991ce76dc6 100644 --- a/module/event/subsystems/nbd/Makefile +++ b/module/event/subsystems/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) C_SRCS = nbd.c LIBNAME = event_nbd diff --git a/module/event/subsystems/net/Makefile b/module/event/subsystems/net/Makefile index 5544257b633..b90cffae456 100644 --- a/module/event/subsystems/net/Makefile +++ b/module/event/subsystems/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 = net.c LIBNAME = event_net diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile index e84743871ca..b51962d2fe0 100644 --- a/module/event/subsystems/nvmf/Makefile +++ b/module/event/subsystems/nvmf/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 nvmf_rpc.c nvmf_tgt.c LIBNAME = event_nvmf diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index 91202c9335f..5d7fc303872 100644 --- a/module/event/subsystems/scsi/Makefile +++ b/module/event/subsystems/scsi/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 = scsi.c LIBNAME = event_scsi diff --git a/module/event/subsystems/vhost/Makefile b/module/event/subsystems/vhost/Makefile index 0994b3dc782..a31bba91fef 100644 --- a/module/event/subsystems/vhost/Makefile +++ b/module/event/subsystems/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) C_SRCS = vhost.c LIBNAME = event_vhost diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index 403d9787a6e..2089a2b9d59 100644 --- a/module/event/subsystems/vmd/Makefile +++ b/module/event/subsystems/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 vmd_rpc.c LIBNAME = event_vmd diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile index 2d53ebc127b..9783e024dd3 100644 --- a/module/sock/posix/Makefile +++ b/module/sock/posix/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 = sock_posix C_SRCS = posix.c diff --git a/module/sock/uring/Makefile b/module/sock/uring/Makefile index 66503fa85ad..2d0e7c4e2b4 100644 --- a/module/sock/uring/Makefile +++ b/module/sock/uring/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 = sock_uring C_SRCS = uring.c diff --git a/module/sock/vpp/Makefile b/module/sock/vpp/Makefile index 6bce450ae73..016018c77c8 100644 --- a/module/sock/vpp/Makefile +++ b/module/sock/vpp/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 += vpp.c CFLAGS += -Wno-sign-compare -Wno-error=old-style-definition diff --git a/shared_lib/Makefile b/shared_lib/Makefile index 4d7a0f26ebf..f6d70cfe771 100644 --- a/shared_lib/Makefile +++ b/shared_lib/Makefile @@ -38,7 +38,6 @@ 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