Code Review
/
vpp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
0db9b04
)
Fix vpp-ext-deps package version in stable branch
55/15255/2
author
Damjan Marion
<damarion@cisco.com>
Thu, 11 Oct 2018 16:18:26 +0000
(09:18 -0700)
committer
Damjan Marion
<dmarion@me.com>
Thu, 11 Oct 2018 20:40:30 +0000
(20:40 +0000)
Change-Id: Ifb33622b50113501f1d23ab94ba9da708678d6be
Signed-off-by: Damjan Marion <damarion@cisco.com>
(cherry picked from commit
5551e41f78249b72715203ecd93586f48acccbf4
)
build/external/Makefile
patch
|
blob
|
history
diff --git
a/build/external/Makefile
b/build/external/Makefile
index
8ac764c
..
1082cfc
100644
(file)
--- 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)