Commit e01cb43b authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

mk/spdk.common.mk sed the minor version 



Older versions of make can't handle shell's param expansion nicely
as in case of something like ${v#0}, the '#' is not treated as part
of the $(shell ...) cmd. This leads to:

spdk/mk/spdk.common.mk:584: *** unterminated call to function 'shell': missing ')'.  Stop.

Escaping \# won't work for newer make builds and some shells that make
may use are still limitted when it comes to other param expansion
variants.

So to make sure it works in all places, just delegate the main work
to sed.

Change-Id: Iaac6fb66ea1addb139e53b1f4cf966e7d5a4745d
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25528


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Mellanox Build Bot
parent d58eef2a

mk/spdk.common.mk

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ $(shell [ "$(call cc_version)" = "$(1)" ] && echo 1 || echo 0) 
endef



version_major := $(shell IFS='-.' read -r v _ _ _ < $(SPDK_ROOT_DIR)/VERSION; echo $$v)

version_minor := $(shell IFS='-.' read -r _ v _ _ < $(SPDK_ROOT_DIR)/VERSION; echo $${v#0})

version_minor := $(shell IFS='-.' read -r _ v _ _ < $(SPDK_ROOT_DIR)/VERSION; echo $$v | sed -e 's/^0//g')

version_patch := $(shell IFS='-.' read -r _ _ v _ < $(SPDK_ROOT_DIR)/VERSION; echo $$v)

version_suffix := $(shell IFS='-.' read -r _ _ _ v < $(SPDK_ROOT_DIR)/VERSION; echo $${v:+-$$v})