From 03ed70da3b3bbbe6cf9f90107c363e35bb94ee77 Mon Sep 17 00:00:00 2001
From: Emre Girgin <50592283+mrgirgin@users.noreply.github.com>
Date: Mon, 12 Oct 2020 16:26:02 -0700
Subject: [PATCH 1/2] Remove implicit git repository dependency

---
 toolkit/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/Makefile b/toolkit/Makefile
index 8c9eff180ff..6f774b74479 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -97,7 +97,12 @@ TLS_KEY     ?=
 
 # Build defines
 DIST_TAG           ?= .cm1
-BUILD_NUMBER       ?= $(shell git rev-parse --short HEAD)
+GIT_REV            ?= $(shell git rev-parse --short HEAD)
+ifeq ($(GIT_REV),)
+	BUILD_NUMBER ?= non-git
+else
+	BUILD_NUBMER ?= $(GIT_REV)
+endif
 RELEASE_MAJOR_ID   ?= 1.0
 # use minor ID defined in file (if exist) otherwise define it
 # note this file must be single line

From 903451ffc6fe57abf05f7d3a9a485b50c167eb6a Mon Sep 17 00:00:00 2001
From: Emre Girgin <50592283+mrgirgin@users.noreply.github.com>
Date: Thu, 15 Oct 2020 08:40:25 -0700
Subject: [PATCH 2/2] Remove the new GIT_REV variable

---
 toolkit/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/toolkit/Makefile b/toolkit/Makefile
index 6f774b74479..509161a39c1 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -97,11 +97,10 @@ TLS_KEY     ?=
 
 # Build defines
 DIST_TAG           ?= .cm1
-GIT_REV            ?= $(shell git rev-parse --short HEAD)
-ifeq ($(GIT_REV),)
-	BUILD_NUMBER ?= non-git
-else
-	BUILD_NUBMER ?= $(GIT_REV)
+BUILD_NUMBER       ?= $(shell git rev-parse --short HEAD)
+# an empty BUILD_NUMBER breaks the build later on
+ifeq ($(BUILD_NUMBER),)
+        BUILD_NUMBER = non-git
 endif
 RELEASE_MAJOR_ID   ?= 1.0
 # use minor ID defined in file (if exist) otherwise define it