Include board name and version in factory toolkit ID string

This makes it easier to tell which factory toolkit it is.

BUG=chrome-os-partner:24798
TEST=Manual w/ and w/o version string

Change-Id: I138ffff1c6d6d893138de6b5baefa3550288e92f
Signed-off-by: Vic (Chun-Ju) Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/183764
Reviewed-by: Jon Salz <jsalz@chromium.org>
diff --git a/make_factory_toolkit.sh b/make_factory_toolkit.sh
index 26a433e..1d3a792 100755
--- a/make_factory_toolkit.sh
+++ b/make_factory_toolkit.sh
@@ -17,6 +17,8 @@
 DEFINE_string board "${DEFAULT_BOARD}" \
   "The board to build a factory toolkit for."
 DEFINE_string output_dir "" "Path to the folder to store the factory toolkit."
+DEFINE_string version "" \
+  "The version tag to be included in the identification string."
 
 cleanup() {
   sudo rm -rf "${temp_pack_root}"
@@ -48,10 +50,14 @@
   emerge-${FLAGS_board} --root="${temp_pack_root}" --nodeps --usepkgonly -v \
     chromeos-factory chromeos-factory-board autotest-factory-install
 
+  if [[ -n "${FLAGS_version}" ]]; then
+    local id_str="${FLAGS_board} Factory Toolkit ${FLAGS_version}"
+  else
+    local id_str="${FLAGS_board} Factory Toolkit"
+  fi
+
   local output_toolkit="${output_dir}/install_factory_toolkit.run"
-  makeself --bzip2 --nox11 "${temp_pack_root}" \
-    "${output_toolkit}" \
-    "Factory Toolkit" \
+  makeself --bzip2 --nox11 "${temp_pack_root}" "${output_toolkit}" "${id_str}" \
     usr/local/factory/py/toolkit/installer.py
 
   echo "