Added PKGDIR spec to setup_board so that it untars the glibc tarballs from the right place.
PRESUBMIT=passed
R=asharif
DELTA=8 (5 added, 0 deleted, 3 changed)
OCL=45178-p2
RCL=45232-p2
RDATE=2010/11/15 12:17:57
P4 change: 42605839
diff --git a/v14/build_chromeos.py b/v14/build_chromeos.py
index 25690fd..954bd0e 100755
--- a/v14/build_chromeos.py
+++ b/v14/build_chromeos.py
@@ -98,9 +98,12 @@
% (options.chromeos_root, options.toolchain_root,
options.board))
utils.AssertTrue(ret == 0, "build_tc.py failed")
+ version_number = utils.GetRoot(rootdir)[1]
+ pkgdir = "/home/${USER}/toolchain_root/" + version_number + "/pkgs"
ret = ExecuteCommandInChroot(options.chromeos_root, options.toolchain_root,
- "./setup_board --board=%s --gcc_version=9999 "
- "%s" % (options.board, force))
+ "PKGDIR=%s ./setup_board --board=%s "
+ " --gcc_version=9999 "
+ "%s" % (pkgdir, options.board, force))
utils.AssertTrue(ret == 0, "setup_board failed")
else:
utils.main_logger.LogOutput("Did not setup_board because it already exists")
@@ -116,9 +119,11 @@
#"CFLAGS='%s'\\\nCXXFLAGS='%s'\\\nLDFLAGS='%s'\\\n" %
#(options.cflags, options.cxxflags, options.ldflags))
ret2 = ExecuteCommandInChroot(options.chromeos_root, options.toolchain_root,
+ "if [ -e /build/%s/etc/make.conf.orig ] ; then "
"sudo echo -e \\\"%s\\\" | sudo tee "
"/build/%s/etc/make.conf > /dev/null ;"
- % (makeconf, options.board))
+ "else exit 1 ; fi"
+ % (options.board, makeconf, options.board))
utils.AssertTrue(ret1 == 0 and ret2 == 0, "Could not modify make.conf")