X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2FMakefile;h=1082cfc1c397a5a93f790175be570f51adec8163;hb=4f5f8d7972dd6931b7c568b3d327f18184533b54;hp=38e8d6346506fede4e0e40f4974e92aaa7bcc804;hpb=561f2730e8b137cd4e7132b05dab49f6e768ae23;p=vpp.git diff --git a/build/external/Makefile b/build/external/Makefile index 38e8d634650..1082cfc1c39 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -20,7 +20,7 @@ MAKE_ARGS ?= -j BUILD_DIR ?= $(CURDIR)/_build INSTALL_DIR ?= $(CURDIR)/_install PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2) -PKG_SUFFIX ?= $(shell git log --oneline $$(git describe --abbrev=0).. . | wc -l) +PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l) JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\ $(shell grep -c ^processor /proc/cpuinfo), 2) @@ -110,7 +110,7 @@ $(DEV_RPM): Makefile rpm/vpp-ext-deps.spec build-rpm: $(DEV_RPM) install-rpm: -ifneq ($(INSTALLED_RPM_VER),$(PRM_VER)-$(PKG_SUFFIX)) +ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX)) @$(MAKE) $(DEV_RPM) sudo rpm -Uih $(DEV_RPM) else