X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2FMakefile;h=a1352a69cbfeab91f7e60383146c809517c07298;hb=1a6ece34358a34367ff1807ac3a9a97b8a120b77;hp=8ac764caf25a08e4e9588ec110538536efd37e9d;hpb=74447d4fc5f5ff1bbde8c0cab26b3aade0548da4;p=vpp.git diff --git a/build/external/Makefile b/build/external/Makefile index 8ac764caf25..a1352a69cbf 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) @@ -112,7 +112,7 @@ build-rpm: $(DEV_RPM) install-rpm: ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX)) @$(MAKE) $(DEV_RPM) - sudo rpm -Uih $(DEV_RPM) + sudo rpm -Uih --force $(DEV_RPM) else @echo "==========================================================" @echo " Up-to-date DPDK package already installed"