diff --git a/lib/idxd/Makefile b/lib/idxd/Makefile index 1d6bf69103..7e8a706f6c 100644 --- a/lib/idxd/Makefile +++ b/lib/idxd/Makefile @@ -34,7 +34,13 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = idxd.c LIBNAME = idxd +SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_idxd.map) + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/idxd/spdk_idxd.map b/lib/idxd/spdk_idxd.map new file mode 100644 index 0000000000..c0e3e7bdb4 --- /dev/null +++ b/lib/idxd/spdk_idxd.map @@ -0,0 +1,17 @@ +{ + global: + + # public functions + spdk_idxd_configure_chan; + spdk_idxd_reconfigure_chan; + spdk_idxd_probe; + spdk_idxd_detach; + spdk_idxd_set_config; + spdk_idxd_submit_copy; + spdk_idxd_submit_fill; + spdk_idxd_process_events; + spdk_idxd_get_channel; + spdk_idxd_put_channel; + + local: *; +}; diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 8576dad2c4..6602a5e52e 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -34,7 +34,8 @@ function confirm_abi_deps() { fi cat << EOF > ${suppression_file} - +[suppress_variable] + name = SPDK_LOG_IDXD EOF for object in "$libdir"/libspdk_*.so; do @@ -87,8 +88,11 @@ EOF if [ "$so_name_changed" != "No" ]; then if ! $found_abi_change; then - echo "SO name for $so_file changed without a change to abi. please revert that change." - touch $fail_file + # Unfortunately, libspdk_idxd made it into 20.04 without an SO suffix. TODO:: remove after 20.07 + if [ "$so_file" != "libspdk_idxd.so" ]; then + echo "SO name for $so_file changed without a change to abi. please revert that change." + touch $fail_file + fi fi if [ "$new_so_maj" != "$old_so_maj" ] && [ "$new_so_min" != "0" ]; then