From 0e139576fccd9e1968c31b90fed87cd7a1fd015d Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Fri, 10 May 2013 02:32:19 +0000 Subject: [PATCH] Small cleanup in build/linux/install-arm-sysroot.py and fix a typo in DEPS. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14647004 git-svn-id: http://src.chromium.org/svn/trunk/src/build@199337 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- linux/install-arm-sysroot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/install-arm-sysroot.py b/linux/install-arm-sysroot.py index ace40847c..56be4a578 100755 --- a/linux/install-arm-sysroot.py +++ b/linux/install-arm-sysroot.py @@ -3,7 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Script to install arm choot image for cross building of arm chrome on linux. +# Script to install ARM root image for cross building of ARM chrome on linux. # This script can be run manually but is more often run as part of gclient # hooks. When run from hooks this script should be a no-op on non-linux # platforms. @@ -24,6 +24,7 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) URL_PREFIX = 'https://commondatastorage.googleapis.com' URL_PATH = 'nativeclient-archive2/toolchain' REVISION = 10991 +TARBALL = 'naclsdk_linux_arm-trusted.tgz' def main(args): @@ -39,8 +40,7 @@ def main(args): src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR)) sysroot = os.path.join(src_root, 'arm-sysroot') - url = "%s/%s/%s/naclsdk_linux_arm-trusted.tgz" % (URL_PREFIX, - URL_PATH, REVISION) + url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL) stamp = os.path.join(sysroot, ".stamp") if os.path.exists(stamp): @@ -53,7 +53,7 @@ def main(args): if os.path.isdir(sysroot): shutil.rmtree(sysroot) os.mkdir(sysroot) - tarball = os.path.join(sysroot, 'naclsdk_linux_arm-trusted.tgz') + tarball = os.path.join(sysroot, TARBALL) subprocess.check_call(['curl', '-L', url, '-o', tarball]) subprocess.check_call(['tar', 'xf', tarball, '-C', sysroot]) os.remove(tarball)