Skip to content

Commit

Permalink
so_ver: increase all major versions
Browse files Browse the repository at this point in the history 
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 22.05
release.

This patch:
- increases SO_VER by 1 for all components
- resets SO_MINOR to 0 for all components
- removes suppressions for ABI tests

Signed-off-by: Tomasz Zawadzki <[email protected]>
Change-Id: Id1a5358882dc496faa5b0b5c9a63b326c378c551
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11361
Tested-by: SPDK CI Jenkins <[email protected]>
Community-CI: Broadcom CI <[email protected]>
Reviewed-by: Jim Harris <[email protected]>
Reviewed-by: Ben Walker <[email protected]>
  • Loading branch information
@tomzawadzki
tomzawadzki authored and Ben Walker committed Jan 31, 2022
1 parent 7a0c901 commit 047c067
Show file tree
Hide file tree
Showing 78 changed files with 87 additions and 85 deletions.
2 changes: 1 addition & 1 deletion lib/accel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 8
SO_VER := 9
SO_MINOR := 0
SO_SUFFIX := $(SO_VER).$(SO_MINOR)

Expand Down
4 changes: 2 additions & 2 deletions lib/bdev/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 8
SO_MINOR := 1
SO_VER := 9
SO_MINOR := 0

ifeq ($(CONFIG_VTUNE),y)
CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify
Expand Down
2 changes: 1 addition & 1 deletion lib/blob/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 6
SO_VER := 7
SO_MINOR := 0

C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c
Expand Down
2 changes: 1 addition & 1 deletion lib/blobfs/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = blobfs.c tree.c
Expand Down
2 changes: 1 addition & 1 deletion lib/conf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = conf.c
Expand Down
2 changes: 1 addition & 1 deletion lib/dma/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 1
SO_VER := 2
SO_MINOR := 0
SO_SUFFIX := $(SO_VER).$(SO_MINOR)

Expand Down
2 changes: 1 addition & 1 deletion lib/env_dpdk/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 8
SO_VER := 9
SO_MINOR := 0

CFLAGS += $(ENV_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion lib/event/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 10
SO_VER := 11
SO_MINOR := 0

CFLAGS += $(ENV_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion lib/ftl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_reloc.c \
Expand Down
2 changes: 1 addition & 1 deletion lib/idxd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = idxd.c idxd_user.c
Expand Down
2 changes: 1 addition & 1 deletion lib/init/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = json_config.c subsystem.c subsystem_rpc.c rpc.c
Expand Down
2 changes: 1 addition & 1 deletion lib/ioat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = ioat.c
Expand Down
2 changes: 1 addition & 1 deletion lib/iscsi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 5
SO_VER := 6
SO_MINOR := 0

CFLAGS += -I$(SPDK_ROOT_DIR)/lib
Expand Down
4 changes: 2 additions & 2 deletions lib/json/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_MINOR := 3
SO_VER := 4
SO_MINOR := 0

C_SRCS = json_parse.c json_util.c json_write.c
LIBNAME = json
Expand Down
2 changes: 1 addition & 1 deletion lib/jsonrpc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

LIBNAME = jsonrpc
Expand Down
4 changes: 2 additions & 2 deletions lib/log/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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
SO_SUFFIX := $(SO_VER).$(SO_MINOR)

C_SRCS = log.c log_flags.c
Expand Down
2 changes: 1 addition & 1 deletion lib/lvol/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = lvol.c
Expand Down
2 changes: 1 addition & 1 deletion lib/nbd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 4
SO_VER := 5
SO_MINOR := 0

LIBNAME = nbd
Expand Down
2 changes: 1 addition & 1 deletion lib/notify/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = notify.c notify_rpc.c
Expand Down
4 changes: 2 additions & 2 deletions lib/nvme/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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 = 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 \
Expand Down
2 changes: 1 addition & 1 deletion lib/nvmf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 11
SO_VER := 12
SO_MINOR := 0

C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \
Expand Down
2 changes: 1 addition & 1 deletion lib/rdma/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_rdma.map)
Expand Down
2 changes: 1 addition & 1 deletion lib/reduce/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = reduce.c
Expand Down
2 changes: 1 addition & 1 deletion lib/rpc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = rpc.c
Expand Down
4 changes: 2 additions & 2 deletions lib/scsi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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 = dev.c lun.c port.c scsi.c scsi_bdev.c scsi_pr.c scsi_rpc.c task.c
LIBNAME = scsi
Expand Down
2 changes: 1 addition & 1 deletion lib/sock/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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 = sock.c sock_rpc.c
Expand Down
4 changes: 2 additions & 2 deletions lib/thread/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 6
SO_MINOR := 1
SO_VER := 7
SO_MINOR := 0

C_SRCS = thread.c
LIBNAME = thread
Expand Down
4 changes: 2 additions & 2 deletions lib/trace/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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

C_SRCS = trace.c trace_flags.c trace_rpc.c
LIBNAME = trace
Expand Down
2 changes: 1 addition & 1 deletion lib/trace_parser/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

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

SO_VER := 1
SO_VER := 2
SO_MINOR := 0

CXX_SRCS = trace.cpp
Expand Down
2 changes: 1 addition & 1 deletion lib/ut_mock/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = mock.c
Expand Down
4 changes: 2 additions & 2 deletions lib/util/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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 = 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 \
Expand Down
2 changes: 1 addition & 1 deletion lib/vfio_user/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = vfio_user_pci.c vfio_user.c
Expand Down
2 changes: 1 addition & 1 deletion lib/vhost/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 5
SO_VER := 6
SO_MINOR := 0

CFLAGS += -I.
Expand Down
2 changes: 1 addition & 1 deletion lib/virtio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

CFLAGS += $(ENV_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion lib/vmd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = vmd.c led.c
Expand Down
2 changes: 1 addition & 1 deletion module/accel/idxd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 2
SO_VER := 3
SO_MINOR := 0

LIBNAME = accel_idxd
Expand Down
2 changes: 1 addition & 1 deletion module/accel/ioat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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_ioat
Expand Down
2 changes: 1 addition & 1 deletion module/bdev/aio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = bdev_aio.c bdev_aio_rpc.c
Expand Down
2 changes: 1 addition & 1 deletion module/bdev/compress/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
Expand Down
2 changes: 1 addition & 1 deletion module/bdev/crypto/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

CFLAGS += $(ENV_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion module/bdev/delay/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

SO_VER := 3
SO_VER := 4
SO_MINOR := 0

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
Expand Down
2 changes: 1 addition & 1 deletion module/bdev/error/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 = vbdev_error.c vbdev_error_rpc.c
Expand Down
Loading

0 comments on commit 047c067

Please sign in to comment.