From a483390aa74859d6318cf8ab64d53b76d95f9855 Mon Sep 17 00:00:00 2001
From: Emre Girgin <50592283+mrgirgin@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:44:37 -0700
Subject: [PATCH] Add architecture at the end of toolkit archive

- Also add `version.txt` file in the toolkit archive as an easy way to verify toolkit version.
---
 toolkit/scripts/toolkit.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/scripts/toolkit.mk b/toolkit/scripts/toolkit.mk
index 10dde28398f..ce7aafd11dd 100644
--- a/toolkit/scripts/toolkit.mk
+++ b/toolkit/scripts/toolkit.mk
@@ -13,10 +13,12 @@ toolkit_component_extra_files = \
 	$(toolkit_root)/.gitignore
 
 # Outputs
-toolkit_archive   = $(OUT_DIR)/toolkit-$(RELEASE_VERSION).tar.gz
+toolkit_version   = $(RELEASE_VERSION)-$(build_arch)
+toolkit_archive   = $(OUT_DIR)/toolkit-$(toolkit_version).tar.gz
 toolkit_remove_archive = $(OUT_DIR)/toolkit-*.tar.gz
 toolkit_build_dir = $(BUILD_DIR)/toolkit
 toolkit_tools_dir = $(toolkit_build_dir)/tools/toolkit_bins
+toolkit_release_file = $(toolkit_build_dir)/version.txt
 
 .PHONY: package-toolkit clean-package-toolkit
 
@@ -32,5 +34,6 @@ package-toolkit: go-tools
 	cp -r $(toolkit_root)/* $(toolkit_build_dir) && \
 	cp $(toolkit_component_extra_files) $(toolkit_build_dir) && \
 	cp $(go_tool_targets) $(toolkit_tools_dir) && \
+	echo "$(toolkit_version)" > $(toolkit_release_file) && \
 	rm -rf $(toolkit_build_dir)/out && \
 	tar -I $(ARCHIVE_TOOL) -cvp -f $(toolkit_archive) -C $(toolkit_build_dir)/.. $(notdir $(toolkit_build_dir))