commit f762ef2e35b28de076f37dc12ea3ad68274f662c
author Charlie Mooney <charliemooney@chromium.org> Tue Aug 12 10:53:12 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Aug 14 02:34:11 2014 +0000
tree 31fff31612b74677e79c205c67bb4f4b15f9d8ea
parent a29db69075c4e9b076a57cfd92206990a59da400

Fix ebuild paths for variant boards

The mtbringup tool was looking for touch firmware ebuilds based on the
base board's name instead of the variants, which isn't correct.  This CL
changes it so that it uses the variant name instead whenever one is
present.

BUG=chromium:402959
TEST=tested with nyan_blaze and it worked

Change-Id: I28afc4bcec905747224d052e30f43ddbace3663b
Signed-off-by: Charlie Mooney <charliemooney@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/212063
Reviewed-by: Dennis Kempin <denniskempin@chromium.org>

mtlib/firmware.py

diff --git a/mtlib/firmware.py b/mtlib/firmware.py
index b6d5a65..d8adc2e 100644
--- a/mtlib/firmware.py
+++ b/mtlib/firmware.py
@@ -93,9 +93,10 @@
     else:
       overlay_name = "overlay-{}-private".format(board)
     self.overlay = src_dir / "private-overlays" / overlay_name
-    self.bcsname = self.overlay.basename.replace("overlay-", "bcs-")
+    self.bcsname = "bcs-{}-private".format(variant if variant else board)
 
-    self.ebuild_name = "chromeos-touch-firmware-{}".format(board)
+    self.ebuild_name = "chromeos-touch-firmware-{}".format(
+                                                  variant if variant else board)
     self.ebuild_dir = self.overlay / "chromeos-base" / self.ebuild_name
     self.ebuild_repo = GitRepo(self.ebuild_dir)
 
@@ -162,7 +163,7 @@
     self.binaries[binary.hw_version] = binary
 
   def GenerateBCSPackage(self, version):
-    tar_name = "chromeos-touch-firmware-{}-{}".format(self.board, version)
+    tar_name = "{}-{}".format(self.ebuild_name, version)
     tar_file = "{}.tbz2".format(tar_name)
 
     tar = tarfile.open(tar_file, "w:bz2")