From 3359bf34d682202107c227ea42ace1c600a04657 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 23 Jan 2023 18:24:28 +0100 Subject: [PATCH] so_ver: increase all major versions To allow SO_MINOR updates on LTS for the whole year it is supported, the major version for all components needs to be increased. This is to prevent scenario where two versions exists with matching versions, but conflicting ABI. Ex. Next SPDK release adds an API call increasing the minor version, then LTS needs just a subset of those additions. Increasing major so version after LTS, allows the future releases to update versions as needed. Yet allowing LTS to increase minor version separately. Disabled test for increasing SO version without ABI change, as that is goal of this patch. This check shall be removed with SPDK 23.05 release. Looks like this was left over from prior LTS, to avoid that make sure it is only skipped when running against v23.01.x as latest release. This patch: - increases SO_VER by 1 for all components - resets SO_MINOR to 0 for all components - removes suppressions for ABI tests Short reference to how the versions were changed: MAX=$(git grep "SO_VER := " | cut -d" " -f 3 | sort -ubnr | head -1) for((i=$MAX;i>0;i-=1)); do find . -name "Makefile" -exec \ sed -i -e "s/SO_VER := $i\$/SO_VER := $(($i+1))/g" {} +; done find . -name "Makefile" -exec \ sed -i -e "s/SO_MINOR := .*/SO_MINOR := 0/g" {} + Change-Id: I3e5681802c0a5ac6d7d652a18896997cd07cc8bf Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16419 Reviewed-by: Ben Walker Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- lib/accel/Makefile | 2 +- lib/bdev/Makefile | 2 +- lib/blob/Makefile | 2 +- lib/blobfs/Makefile | 2 +- lib/conf/Makefile | 2 +- lib/dma/Makefile | 2 +- lib/env_dpdk/Makefile | 2 +- lib/event/Makefile | 2 +- lib/ftl/Makefile | 2 +- lib/idxd/Makefile | 2 +- lib/init/Makefile | 2 +- lib/ioat/Makefile | 2 +- lib/iscsi/Makefile | 2 +- lib/json/Makefile | 4 ++-- lib/jsonrpc/Makefile | 2 +- lib/log/Makefile | 4 ++-- lib/lvol/Makefile | 2 +- lib/mlx5/Makefile | 2 +- lib/nbd/Makefile | 2 +- lib/notify/Makefile | 2 +- lib/nvme/Makefile | 4 ++-- lib/nvmf/Makefile | 2 +- lib/rdma/Makefile | 4 ++-- lib/reduce/Makefile | 2 +- lib/rpc/Makefile | 4 ++-- lib/scsi/Makefile | 2 +- lib/sock/Makefile | 2 +- lib/thread/Makefile | 4 ++-- lib/trace/Makefile | 4 ++-- lib/trace_parser/Makefile | 2 +- lib/ublk/Makefile | 2 +- lib/ut_mock/Makefile | 2 +- lib/util/Makefile | 4 ++-- lib/vfio_user/host/Makefile | 4 ++-- lib/vfu_tgt/Makefile | 2 +- lib/vhost/Makefile | 2 +- lib/virtio/Makefile | 2 +- lib/vmd/Makefile | 4 ++-- module/accel/dpdk_compressdev/Makefile | 2 +- module/accel/dpdk_cryptodev/Makefile | 2 +- module/accel/dsa/Makefile | 2 +- module/accel/iaa/Makefile | 2 +- module/accel/ioat/Makefile | 2 +- module/accel/mlx5/Makefile | 2 +- module/bdev/aio/Makefile | 2 +- module/bdev/compress/Makefile | 2 +- module/bdev/crypto/Makefile | 2 +- module/bdev/daos/Makefile | 2 +- module/bdev/delay/Makefile | 2 +- module/bdev/error/Makefile | 2 +- module/bdev/ftl/Makefile | 2 +- module/bdev/gpt/Makefile | 2 +- module/bdev/iscsi/Makefile | 2 +- module/bdev/lvol/Makefile | 2 +- module/bdev/malloc/Makefile | 2 +- module/bdev/null/Makefile | 2 +- module/bdev/nvme/Makefile | 2 +- module/bdev/ocf/Makefile | 2 +- module/bdev/passthru/Makefile | 2 +- module/bdev/pmem/Makefile | 2 +- module/bdev/raid/Makefile | 2 +- module/bdev/rbd/Makefile | 2 +- module/bdev/split/Makefile | 2 +- module/bdev/uring/Makefile | 2 +- module/bdev/virtio/Makefile | 2 +- module/bdev/xnvme/Makefile | 2 +- module/bdev/zone_block/Makefile | 2 +- module/blob/bdev/Makefile | 2 +- module/blobfs/bdev/Makefile | 2 +- module/env_dpdk/Makefile | 2 +- module/event/subsystems/accel/Makefile | 2 +- module/event/subsystems/bdev/Makefile | 2 +- module/event/subsystems/iobuf/Makefile | 2 +- module/event/subsystems/iscsi/Makefile | 2 +- module/event/subsystems/nbd/Makefile | 2 +- module/event/subsystems/nvmf/Makefile | 2 +- module/event/subsystems/scheduler/Makefile | 2 +- module/event/subsystems/scsi/Makefile | 2 +- module/event/subsystems/sock/Makefile | 2 +- module/event/subsystems/ublk/Makefile | 2 +- module/event/subsystems/vfu_tgt/Makefile | 2 +- module/event/subsystems/vhost_blk/Makefile | 2 +- module/event/subsystems/vhost_scsi/Makefile | 2 +- module/event/subsystems/vmd/Makefile | 2 +- module/scheduler/dpdk_governor/Makefile | 2 +- module/scheduler/dynamic/Makefile | 2 +- module/scheduler/gscheduler/Makefile | 2 +- module/sock/posix/Makefile | 2 +- module/sock/uring/Makefile | 2 +- module/vfu_device/Makefile | 2 +- shared_lib/Makefile | 2 +- test/make/check_so_deps.sh | 6 ++++-- 92 files changed, 105 insertions(+), 103 deletions(-) diff --git a/lib/accel/Makefile b/lib/accel/Makefile index cfc92ec06..c50e29046 100644 --- a/lib/accel/Makefile +++ b/lib/accel/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 11 +SO_VER := 12 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 0e1bc3742..443cc732b 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 11 +SO_VER := 12 SO_MINOR := 0 ifeq ($(CONFIG_VTUNE),y) diff --git a/lib/blob/Makefile b/lib/blob/Makefile index e12216aba..a501339c6 100644 --- a/lib/blob/Makefile +++ b/lib/blob/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 9 +SO_VER := 10 SO_MINOR := 0 C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c diff --git a/lib/blobfs/Makefile b/lib/blobfs/Makefile index fe21506ba..240e88033 100644 --- a/lib/blobfs/Makefile +++ b/lib/blobfs/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 +SO_VER := 9 SO_MINOR := 0 C_SRCS = blobfs.c tree.c diff --git a/lib/conf/Makefile b/lib/conf/Makefile index 8125b9050..89c27aceb 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = conf.c diff --git a/lib/dma/Makefile b/lib/dma/Makefile index 5ceed56bc..48704d1ae 100644 --- a/lib/dma/Makefile +++ b/lib/dma/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index 32d5f0a7e..7a53d1cde 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 11 +SO_VER := 12 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/event/Makefile b/lib/event/Makefile index d625c976d..9a94e9b9e 100644 --- a/lib/event/Makefile +++ b/lib/event/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 11 +SO_VER := 12 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) -Wno-address-of-packed-member diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile index 28adb26b1..0a4ddf1b7 100644 --- a/lib/ftl/Makefile +++ b/lib/ftl/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 ifdef SPDK_FTL_VSS_EMU diff --git a/lib/idxd/Makefile b/lib/idxd/Makefile index df76d936e..95aeb5f90 100644 --- a/lib/idxd/Makefile +++ b/lib/idxd/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 9 +SO_VER := 10 SO_MINOR := 0 C_SRCS = idxd.c idxd_user.c diff --git a/lib/init/Makefile b/lib/init/Makefile index 5266daf90..0f261f405 100644 --- a/lib/init/Makefile +++ b/lib/init/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = json_config.c subsystem.c subsystem_rpc.c rpc.c diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index 2536acce6..fa8f4acc6 100644 --- a/lib/ioat/Makefile +++ b/lib/ioat/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = ioat.c diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile index ac9faa06e..bfc179153 100644 --- a/lib/iscsi/Makefile +++ b/lib/iscsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/lib/json/Makefile b/lib/json/Makefile index e725cabb1..334c51477 100644 --- a/lib/json/Makefile +++ b/lib/json/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 C_SRCS = json_parse.c json_util.c json_write.c LIBNAME = json diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile index f5e958585..fc178d011 100644 --- a/lib/jsonrpc/Makefile +++ b/lib/jsonrpc/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 LIBNAME = jsonrpc diff --git a/lib/log/Makefile b/lib/log/Makefile index d5b54e661..83c99fc4b 100644 --- a/lib/log/Makefile +++ b/lib/log/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 -SO_MINOR := 1 +SO_VER := 6 +SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = log.c log_flags.c log_deprecated.c diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile index d92750237..3f2bbc1bb 100644 --- a/lib/lvol/Makefile +++ b/lib/lvol/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 +SO_VER := 9 SO_MINOR := 0 C_SRCS = lvol.c diff --git a/lib/mlx5/Makefile b/lib/mlx5/Makefile index 511c83215..5e429adc3 100644 --- a/lib/mlx5/Makefile +++ b/lib/mlx5/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = mlx5_crypto.c diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile index e8da680b8..9d2b0d503 100644 --- a/lib/nbd/Makefile +++ b/lib/nbd/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 LIBNAME = nbd diff --git a/lib/notify/Makefile b/lib/notify/Makefile index 26d633a39..24c7550b0 100644 --- a/lib/notify/Makefile +++ b/lib/notify/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = notify.c notify_rpc.c diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index 4dca296bb..244e729e0 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 9 -SO_MINOR := 1 +SO_VER := 10 +SO_MINOR := 0 C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c \ nvme_ns.c nvme_pcie_common.c nvme_pcie.c nvme_qpair.c nvme.c \ diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index 97733da44..bc2e18606 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 14 +SO_VER := 15 SO_MINOR := 0 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ diff --git a/lib/rdma/Makefile b/lib/rdma/Makefile index e3fde94e1..706d7fde6 100644 --- a/lib/rdma/Makefile +++ b/lib/rdma/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_rdma.map) diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile index 78da0ea87..c77c7d6c3 100644 --- a/lib/reduce/Makefile +++ b/lib/reduce/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = reduce.c diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile index 9d4b34287..553126bea 100644 --- a/lib/rpc/Makefile +++ b/lib/rpc/Makefile @@ -7,8 +7,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 2 +SO_VER := 5 +SO_MINOR := 0 C_SRCS = rpc.c LIBNAME = rpc diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile index 8ad918e74..d4ecbb105 100644 --- a/lib/scsi/Makefile +++ b/lib/scsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = dev.c lun.c port.c scsi.c scsi_bdev.c scsi_pr.c scsi_rpc.c task.c diff --git a/lib/sock/Makefile b/lib/sock/Makefile index 184b3faa8..586fa288c 100644 --- a/lib/sock/Makefile +++ b/lib/sock/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 7 +SO_VER := 8 SO_MINOR := 0 C_SRCS = sock.c sock_rpc.c diff --git a/lib/thread/Makefile b/lib/thread/Makefile index 359d5aa70..8f48ae8fa 100644 --- a/lib/thread/Makefile +++ b/lib/thread/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 7 -SO_MINOR := 1 +SO_VER := 8 +SO_MINOR := 0 C_SRCS = thread.c LIBNAME = thread diff --git a/lib/trace/Makefile b/lib/trace/Makefile index 70dfbf07b..6ffd7fab1 100644 --- a/lib/trace/Makefile +++ b/lib/trace/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 7 -SO_MINOR := 1 +SO_VER := 8 +SO_MINOR := 0 C_SRCS = trace.c trace_flags.c trace_rpc.c LIBNAME = trace diff --git a/lib/trace_parser/Makefile b/lib/trace_parser/Makefile index e1c14b90b..1b4818ecb 100644 --- a/lib/trace_parser/Makefile +++ b/lib/trace_parser/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CXX_SRCS = trace.cpp diff --git a/lib/ublk/Makefile b/lib/ublk/Makefile index 20dd51c7e..e09ca01a2 100644 --- a/lib/ublk/Makefile +++ b/lib/ublk/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = ublk.c ublk_rpc.c diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile index b88a42fe3..a6c08eade 100644 --- a/lib/ut_mock/Makefile +++ b/lib/ut_mock/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = mock.c diff --git a/lib/util/Makefile b/lib/util/Makefile index bf3037207..1c63ee922 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 -SO_MINOR := 2 +SO_VER := 6 +SO_MINOR := 0 C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c \ dif.c fd.c file.c hexlify.c iov.c math.c pipe.c strerror_tls.c string.c uuid.c \ diff --git a/lib/vfio_user/host/Makefile b/lib/vfio_user/host/Makefile index abf6614d1..6973a1e89 100644 --- a/lib/vfio_user/host/Makefile +++ b/lib/vfio_user/host/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 -SO_MINOR := 1 +SO_VER := 4 +SO_MINOR := 0 C_SRCS = vfio_user_pci.c vfio_user.c LIBNAME = vfio_user diff --git a/lib/vfu_tgt/Makefile b/lib/vfu_tgt/Makefile index c4020cff2..a99aa85e5 100644 --- a/lib/vfu_tgt/Makefile +++ b/lib/vfu_tgt/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS += tgt_endpoint.c tgt_rpc.c diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile index 912ac7dbb..b839e1876 100644 --- a/lib/vhost/Makefile +++ b/lib/vhost/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 CFLAGS += -I. diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile index d154a0302..04fe702ba 100644 --- a/lib/virtio/Makefile +++ b/lib/virtio/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile index 01f3fc8d5..992b88581 100644 --- a/lib/vmd/Makefile +++ b/lib/vmd/Makefile @@ -6,8 +6,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 C_SRCS = vmd.c led.c LIBNAME = vmd diff --git a/module/accel/dpdk_compressdev/Makefile b/module/accel/dpdk_compressdev/Makefile index b2a70894c..1024d24ee 100644 --- a/module/accel/dpdk_compressdev/Makefile +++ b/module/accel/dpdk_compressdev/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/accel/dpdk_cryptodev/Makefile b/module/accel/dpdk_cryptodev/Makefile index 666b73ad2..f3fd583f5 100644 --- a/module/accel/dpdk_cryptodev/Makefile +++ b/module/accel/dpdk_cryptodev/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/accel/dsa/Makefile b/module/accel/dsa/Makefile index 25f98572c..da104fbbe 100644 --- a/module/accel/dsa/Makefile +++ b/module/accel/dsa/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = accel_dsa diff --git a/module/accel/iaa/Makefile b/module/accel/iaa/Makefile index 89a2a9d52..fe8ddf082 100644 --- a/module/accel/iaa/Makefile +++ b/module/accel/iaa/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = accel_iaa diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile index dd6f3f98e..3482b920f 100644 --- a/module/accel/ioat/Makefile +++ b/module/accel/ioat/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 LIBNAME = accel_ioat diff --git a/module/accel/mlx5/Makefile b/module/accel/mlx5/Makefile index 9c88ca343..2c2d24999 100644 --- a/module/accel/mlx5/Makefile +++ b/module/accel/mlx5/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = accel_mlx5 diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile index 25d93d345..e11ada0c1 100644 --- a/module/bdev/aio/Makefile +++ b/module/bdev/aio/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_aio.c bdev_aio_rpc.c diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile index f611231e5..9cd53cf1b 100644 --- a/module/bdev/compress/Makefile +++ b/module/bdev/compress/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile index 92b12b5ae..b894d6564 100644 --- a/module/bdev/crypto/Makefile +++ b/module/bdev/crypto/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/bdev/daos/Makefile b/module/bdev/daos/Makefile index 1f02d3e85..befbd0104 100644 --- a/module/bdev/daos/Makefile +++ b/module/bdev/daos/Makefile @@ -5,7 +5,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = bdev_daos.c bdev_daos_rpc.c diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile index d52ded667..52c47df59 100644 --- a/module/bdev/delay/Makefile +++ b/module/bdev/delay/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile index f277de403..07ef4ed0a 100644 --- a/module/bdev/error/Makefile +++ b/module/bdev/error/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = vbdev_error.c vbdev_error_rpc.c diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile index a3a3722e7..f5fad7ef0 100644 --- a/module/bdev/ftl/Makefile +++ b/module/bdev/ftl/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/ftl/ diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile index c2a60b712..6e7d639e2 100644 --- a/module/bdev/gpt/Makefile +++ b/module/bdev/gpt/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = gpt.c vbdev_gpt.c diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile index 42fcaec16..3b974f642 100644 --- a/module/bdev/iscsi/Makefile +++ b/module/bdev/iscsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index 824cd0150..08db4ac75 100644 --- a/module/bdev/lvol/Makefile +++ b/module/bdev/lvol/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile index 3a50b27b0..497fdc6c4 100644 --- a/module/bdev/malloc/Makefile +++ b/module/bdev/malloc/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_malloc.c bdev_malloc_rpc.c diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile index 3a4a4cc1b..918396148 100644 --- a/module/bdev/null/Makefile +++ b/module/bdev/null/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_null.c bdev_null_rpc.c diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index 8e888a667..ca256366c 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/nvme/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c bdev_mdns_client.c diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index 19eb8897c..7871a6542 100644 --- a/module/bdev/ocf/Makefile +++ b/module/bdev/ocf/Makefile @@ -7,7 +7,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/env_ocf -I$(SPDK_ROOT_DIR)/lib/env_ocf/include diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile index 6fb95d314..f22f80799 100644 --- a/module/bdev/passthru/Makefile +++ b/module/bdev/passthru/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile index 430e1c5d0..a3b3bcd49 100644 --- a/module/bdev/pmem/Makefile +++ b/module/bdev/pmem/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_pmem.c bdev_pmem_rpc.c diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile index 162ecee19..17ad7f419 100644 --- a/module/bdev/raid/Makefile +++ b/module/bdev/raid/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index b74c9674e..26ac1bac4 100644 --- a/module/bdev/rbd/Makefile +++ b/module/bdev/rbd/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = bdev_rbd.c bdev_rbd_rpc.c diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile index a7145648d..defe92ed5 100644 --- a/module/bdev/split/Makefile +++ b/module/bdev/split/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = vbdev_split.c vbdev_split_rpc.c diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile index 6e4114344..170e7303c 100644 --- a/module/bdev/uring/Makefile +++ b/module/bdev/uring/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_uring.c bdev_uring_rpc.c diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile index 608f1a018..96c6f7697 100644 --- a/module/bdev/virtio/Makefile +++ b/module/bdev/virtio/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c diff --git a/module/bdev/xnvme/Makefile b/module/bdev/xnvme/Makefile index a44d27a8b..707e12fbf 100644 --- a/module/bdev/xnvme/Makefile +++ b/module/bdev/xnvme/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = bdev_xnvme.c bdev_xnvme_rpc.c diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile index f023852e4..896444a79 100644 --- a/module/bdev/zone_block/Makefile +++ b/module/bdev/zone_block/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = vbdev_zone_block.c vbdev_zone_block_rpc.c diff --git a/module/blob/bdev/Makefile b/module/blob/bdev/Makefile index bffa660d0..9100f1ebd 100644 --- a/module/blob/bdev/Makefile +++ b/module/blob/bdev/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 9 +SO_VER := 10 SO_MINOR := 0 C_SRCS = blob_bdev.c diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile index 0cc7981df..c184c9b60 100644 --- a/module/blobfs/bdev/Makefile +++ b/module/blobfs/bdev/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = blobfs_bdev.c blobfs_bdev_rpc.c diff --git a/module/env_dpdk/Makefile b/module/env_dpdk/Makefile index fcd3a9b12..14931d141 100644 --- a/module/env_dpdk/Makefile +++ b/module/env_dpdk/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = env_dpdk_rpc.c diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile index fb1b73036..603f278e7 100644 --- a/module/event/subsystems/accel/Makefile +++ b/module/event/subsystems/accel/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = accel.c diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index 53388581e..f8197050a 100644 --- a/module/event/subsystems/bdev/Makefile +++ b/module/event/subsystems/bdev/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev.c diff --git a/module/event/subsystems/iobuf/Makefile b/module/event/subsystems/iobuf/Makefile index 96a89ccd6..195f26506 100644 --- a/module/event/subsystems/iobuf/Makefile +++ b/module/event/subsystems/iobuf/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = iobuf.c iobuf_rpc.c diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile index 2c091c395..a0c77b107 100644 --- a/module/event/subsystems/iscsi/Makefile +++ b/module/event/subsystems/iscsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index c2fe23ac3..ed2546a60 100644 --- a/module/event/subsystems/nbd/Makefile +++ b/module/event/subsystems/nbd/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = nbd.c diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile index 7d8fcfa7c..0cd0eebc6 100644 --- a/module/event/subsystems/nvmf/Makefile +++ b/module/event/subsystems/nvmf/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = nvmf_rpc.c nvmf_tgt.c diff --git a/module/event/subsystems/scheduler/Makefile b/module/event/subsystems/scheduler/Makefile index f52d67907..4e0c38d5f 100644 --- a/module/event/subsystems/scheduler/Makefile +++ b/module/event/subsystems/scheduler/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = scheduler.c diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index fa7356d1b..4f2387cfb 100644 --- a/module/event/subsystems/scsi/Makefile +++ b/module/event/subsystems/scsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = scsi.c diff --git a/module/event/subsystems/sock/Makefile b/module/event/subsystems/sock/Makefile index e6f12402e..5ccba0f56 100644 --- a/module/event/subsystems/sock/Makefile +++ b/module/event/subsystems/sock/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = sock.c diff --git a/module/event/subsystems/ublk/Makefile b/module/event/subsystems/ublk/Makefile index 499045896..e855e2e81 100644 --- a/module/event/subsystems/ublk/Makefile +++ b/module/event/subsystems/ublk/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = ublk.c diff --git a/module/event/subsystems/vfu_tgt/Makefile b/module/event/subsystems/vfu_tgt/Makefile index d6bd9680e..4a66d5a26 100644 --- a/module/event/subsystems/vfu_tgt/Makefile +++ b/module/event/subsystems/vfu_tgt/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = vfu_tgt.c diff --git a/module/event/subsystems/vhost_blk/Makefile b/module/event/subsystems/vhost_blk/Makefile index 3e831b71a..f5a180590 100644 --- a/module/event/subsystems/vhost_blk/Makefile +++ b/module/event/subsystems/vhost_blk/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = vhost_blk.c diff --git a/module/event/subsystems/vhost_scsi/Makefile b/module/event/subsystems/vhost_scsi/Makefile index fc2ad51c2..8216a2b0c 100644 --- a/module/event/subsystems/vhost_scsi/Makefile +++ b/module/event/subsystems/vhost_scsi/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = vhost_scsi.c diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index 5fa0fbef5..2dd0ee827 100644 --- a/module/event/subsystems/vmd/Makefile +++ b/module/event/subsystems/vmd/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = vmd.c vmd_rpc.c diff --git a/module/scheduler/dpdk_governor/Makefile b/module/scheduler/dpdk_governor/Makefile index 07717a837..2fbb87ffc 100644 --- a/module/scheduler/dpdk_governor/Makefile +++ b/module/scheduler/dpdk_governor/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/scheduler/dynamic/Makefile b/module/scheduler/dynamic/Makefile index 81815d8b6..5d42ffff1 100644 --- a/module/scheduler/dynamic/Makefile +++ b/module/scheduler/dynamic/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = scheduler_dynamic diff --git a/module/scheduler/gscheduler/Makefile b/module/scheduler/gscheduler/Makefile index 20d71e689..d15b1f3f5 100644 --- a/module/scheduler/gscheduler/Makefile +++ b/module/scheduler/gscheduler/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = scheduler_gscheduler diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile index e08c8ba4a..3b747f0c4 100644 --- a/module/sock/posix/Makefile +++ b/module/sock/posix/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 LIBNAME = sock_posix diff --git a/module/sock/uring/Makefile b/module/sock/uring/Makefile index c506d2743..10e7c4b0a 100644 --- a/module/sock/uring/Makefile +++ b/module/sock/uring/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = sock_uring diff --git a/module/vfu_device/Makefile b/module/vfu_device/Makefile index 73a3905a8..96677f3e5 100644 --- a/module/vfu_device/Makefile +++ b/module/vfu_device/Makefile @@ -6,7 +6,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = vfu_virtio.c vfu_virtio_blk.c vfu_virtio_scsi.c vfu_virtio_rpc.c diff --git a/shared_lib/Makefile b/shared_lib/Makefile index cec085f06..5829d600d 100644 --- a/shared_lib/Makefile +++ b/shared_lib/Makefile @@ -8,7 +8,7 @@ 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 := 4 +SO_VER := 5 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index fd63b819a..dc34762a1 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -184,8 +184,10 @@ EOF fi if [[ $so_name_changed == yes ]]; then - # After 22.01 LTS all SO major versions were intentionally increased. Disable this check until SPDK 22.05 release. - found_abi_change=true + # After 23.01 LTS all SO major versions were intentionally increased. This check can be removed after SPDK 23.05 release. + if [[ "$release" == "v23.01.x" ]]; then + found_abi_change=true + fi if ! $found_abi_change; then echo "SO name for $so_file changed without a change to abi. please revert that change." touch $fail_file