commit 17c1962b6f05920e21a5d869dec11fa21d5c2ea0
author Stefan Reinauer <reinauer@chromium.org> Fri Sep 16 12:47:41 2011 -0700
committer Stefan Reinauer <reinauer@google.com> Fri Sep 16 13:15:50 2011 -0700
tree 9df806c705ffbad113fec20fbf595b743c9153be
parent 37ae22902938a54f6a899140e595cc271ede1386

bundle_firmware: new coreboot-utils host package.

BUG=chrome-os-partner:5673
TEST=emerge-lumpy chromeos-bootimage should use the utilities in
     /usr/bin

Change-Id: I91eab47d6fbfb619fd6ba3d3bd23d6a3ae57310b
Reviewed-on: http://gerrit.chromium.org/gerrit/7877
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: Stefan Reinauer <reinauer@google.com>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 15f1fb8..16656ef 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -348,7 +348,7 @@
       CmdError if a command fails.
     """
     bootstub = os.path.join(self._tools.outdir, 'coreboot-full.rom')
-    cbfstool = os.path.join(os.path.dirname(coreboot), "cbfstool")
+    cbfstool = "/usr/bin/cbfstool"
     uboot_elf = uboot.replace(".bin", ".elf")
     shutil.copyfile(coreboot, bootstub)
     self._tools.Run(cbfstool, [bootstub, 'add-payload', uboot_elf,