build: separate package suffixes for vpp-ext-deps and vpp-opt-deps

Type: make

Change-Id: Icc8b4937ed98474da9d27668318a2a9e3d4a3ae5
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/build/build_common.mk b/build/build_common.mk
index 92a7f03..5c4a165 100644 (file)
--- a/build/build_common.mk
+++ b/build/build_common.mk
@@ -20,7 +20,6 @@ BUILD_DIR        ?= $(CURDIR)/_build
 INSTALL_DIR      ?= $(CURDIR)/_install
 DOWNLOAD_DIR     ?= $(CURDIR)/downloads
 PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
-PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
 SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .)
 ifeq ($(shell uname), FreeBSD)
 JOBS := $(shell nproc)

diff --git a/build/external/Makefile b/build/external/Makefile
index d70ba7c..5394ecc 100644 (file)
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
+
 include ../build_common.mk
 include ../packages_common.mk
 

diff --git a/build/optional/Makefile b/build/optional/Makefile
index 012d4c9..c94412f 100644 (file)
--- a/build/optional/Makefile
+++ b/build/optional/Makefile
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
+
 include ../build_common.mk
 include ../packages_common.mk