Minor fixes to get setup_chromeos and build_chromeos working with build_tc
PRESUBMIT=passed
R=asharif,bjanakiraman
DELTA=19 (5 added, 3 deleted, 11 changed)
OCL=45153-p2
RCL=45166-p2
RDATE=2010/11/11 11:32:00
P4 change: 42605749
diff --git a/v14/build_chromeos.py b/v14/build_chromeos.py
index 05ead83..25690fd 100755
--- a/v14/build_chromeos.py
+++ b/v14/build_chromeos.py
@@ -87,19 +87,20 @@
utils.main_logger.LogOutput("Did not make_chroot because it already exists")
# Setup board
- if (not os.path.isdir(options.chromeos_root + "/chroot/" + options.board)
- or options.clobber_board):
+ if not os.path.isdir(options.chromeos_root + "/chroot/build/"
+ + options.board) or options.clobber_board:
force = ""
if options.clobber_board:
force = "--force"
- version_number = utils.GetRoot(rootdir)[1]
- pkgdir = "/home/${USER}/toolchain_root/" + version_number
+ # Run build_tc.py from binary package
+ ret = utils.RunCommand("./build_tc.py --chromeos_root=%s "
+ "--toolchain_root=%s --board=%s -B"
+ % (options.chromeos_root, options.toolchain_root,
+ options.board))
+ utils.AssertTrue(ret == 0, "build_tc.py failed")
ret = ExecuteCommandInChroot(options.chromeos_root, options.toolchain_root,
- "FEATURES=\\\"keepwork noclean\\\" "
- "PKGDIR=%s ./setup_board --board=%s "
- "%s" % (pkgdir, options.board, force))
- if ret != 0:
- utils.main_logger.LogError("setup_board failed")
+ "./setup_board --board=%s --gcc_version=9999 "
+ "%s" % (options.board, force))
utils.AssertTrue(ret == 0, "setup_board failed")
else:
utils.main_logger.LogOutput("Did not setup_board because it already exists")