Cleanup ARM trusted-toolchain-creator scripts

tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.trusty.sh

 #!/bin/bash
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 #@ This script builds the (trusted) cross toolchain for arm.
 #@ It must be run from the native_client/ directory.
 #@
 #@ The toolchain consists primarily of a jail with arm header and libraries.
 #@ It also provides additional tools such as QEMU.
 #@ It does NOT provide the actual cross compiler anymore.
-#@ The cross compiler is now comming straight from a debian package.
-#@ So there is a one-time step required for all machines using this TC.
-#@ Which is especially true for build-bots:
+#@ The cross compiler is now coming straight from a Debian package.
+#@ So there is a one-time step required for all machines using this TC:
 #@
-#@  tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.trusty.sh  InstallCrossArmBasePackages
+#@  tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.trusty.sh InstallCrossArmBasePackages
 #@
+#@ Generally this script is invoked as:
 #@
-#@  Generally this script is invoked as:
 #@  tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.trusty.sh <mode> <args>*
-#@  Available modes are shown below.
-#@
-#@ This Toolchain was tested with Ubuntu Precise
-#@
-#@ Usage of this TC:
-#@  compile: arm-linux-gnueabihf-gcc -march=armv7-a -isystem ${JAIL}/usr/include
-#@  link:    arm-linux-gnueabihf-gcc -L${JAIL}/usr/lib -L${JAIL}/usr/lib/arm-linux-gnueabihf
-#@                                 -L${JAIL}/lib -L${JAIL}/lib/arm-linux-gnueabihf
-#@
-#@ Usage of QEMU
-#@  TBD
 #@
 #@ List of modes:
 
 ######################################################################
 # Config
 ######################################################################
 
 set -o nounset
 set -o errexit
 
+readonly DIST=trusty
 readonly SCRIPT_DIR=$(dirname $0)
-
-# this where we create the ARMHF "jail"
-readonly INSTALL_ROOT=$(pwd)/toolchain/linux_x86/arm_trusted
-
-readonly TMP=/tmp/armhf-crosstool-trusty
-
+readonly NACL_ROOT=$(pwd)
+# this where we create the ARMHF sysroot
+readonly INSTALL_ROOT=${NACL_ROOT}/toolchain/linux_x86/arm_trusted
+readonly TAR_ARCHIVE=$(dirname ${NACL_ROOT})/out/sysroot_arm_trusted_${DIST}.tgz
+readonly TMP=$(dirname ${NACL_ROOT})/out/sysroot_arm_trusted_${DIST}
 readonly REQUIRED_TOOLS="wget"
-
 readonly MAKE_OPTS="-j8"
 
 ######################################################################
 # Package Config
 ######################################################################
 
 # this where we get the cross toolchain from for the manual install:
 readonly CROSS_ARM_TC_REPO=http://archive.ubuntu.com/ubuntu
 # this is where we get all the armhf packages from
 readonly ARMHF_REPO=http://ports.ubuntu.com/ubuntu-ports
 
-readonly PACKAGE_LIST="${ARMHF_REPO}/dists/trusty/main/binary-armhf/Packages.bz2"
-readonly PACKAGE_LIST2="${ARMHF_REPO}/dists/trusty-security/main/binary-armhf/Packages.bz2"
+readonly PACKAGE_LIST="${ARMHF_REPO}/dists/${DIST}/main/binary-armhf/Packages.bz2"
+readonly PACKAGE_LIST2="${ARMHF_REPO}/dists/${DIST}-security/main/binary-armhf/Packages.bz2"
 
 # Packages for the host system
 readonly CROSS_ARM_TC_PACKAGES="\
   g++-arm-linux-gnueabihf"
 
 # Jail packages: these are good enough for native client
 # NOTE: the package listing here should be updated using the
 # GeneratePackageListXXX() functions below
 readonly ARMHF_BASE_PACKAGES="\
   libssl-dev \
   libssl1.0.0 \
   libgcc1 \
   libc6 \
   libc6-dev \
   libstdc++6 \
   libx11-dev \
   libx11-6 \
   x11proto-core-dev \
   libxt-dev \
   libxt6 \
   zlib1g \
   zlib1g-dev"
 
 # Additional jail packages needed to build chrome
 # NOTE: the package listing here should be updated using the
 # GeneratePackageListXXX() functions below
-readonly ARMHF_BASE_DEP_LIST="${SCRIPT_DIR}/packagelist.trusty.armhf.base"
+readonly ARMHF_BASE_DEP_LIST="${SCRIPT_DIR}/packagelist.${DIST}.armhf.base"
 readonly ARMHF_BASE_DEP_FILES="$(cat ${ARMHF_BASE_DEP_LIST})"
 
 readonly ARMHF_EXTRA_PACKAGES="\
   comerr-dev \
   krb5-multidev \
   libasound2 \
   libasound2-dev \
   libatk1.0-0 \
   libatk1.0-dev \
   libcairo2 \
@@ skipping 111 matching lines @@
   x11proto-input-dev \
   x11proto-kb-dev \
   x11proto-randr-dev \
   x11proto-record-dev \
   x11proto-render-dev \
   x11proto-scrnsaver-dev \
   x11proto-xext-dev"
 
 # NOTE: the package listing here should be updated using the
 # GeneratePackageListXXX() functions below
-readonly ARMHF_EXTRA_DEP_LIST="${SCRIPT_DIR}/packagelist.trusty.armhf.extra"
+readonly ARMHF_EXTRA_DEP_LIST="${SCRIPT_DIR}/packagelist.${DIST}.armhf.extra"
 readonly ARMHF_EXTRA_DEP_FILES="$(cat ${ARMHF_EXTRA_DEP_LIST})"
 
 ######################################################################
 # Helper
 ######################################################################
 
 Banner() {
   echo "######################################################################"
   echo $*
   echo "######################################################################"
@@ skipping 63 matching lines @@
 
 
 # TODO(robertm): consider wiping all of ${BASE_DIR}
 ClearInstallDir() {
   Banner "clearing dirs in ${INSTALL_ROOT}"
   rm -rf ${INSTALL_ROOT}/*
 }
 
 
 CreateTarBall() {
-  local tarball=$1
-  Banner "creating tar ball ${tarball}"
-  tar cfz ${tarball} -C ${INSTALL_ROOT} .
+  Banner "creating tar ball ${TAR_ARCHIVE}"
+  tar cfz ${TAR_ARCHIVE} -C ${INSTALL_ROOT} .
 }
 
 ######################################################################
 # One of these has to be run ONCE per machine
 ######################################################################
 
 #@
 #@ InstallCrossArmBasePackages
 #@
 #@      Install packages needed for arm cross compilation.
@@ skipping 71 matching lines @@
   done
   popd
 }
 
 #@
 #@ BuildAndInstallQemu
 #@
 #@     Build ARM emulator including some patches for better tracing
 #
 # Historic Notes:
-# Traditionally we were builidng static 32 bit images of qemu on a
+# Traditionally we were building static 32 bit images of qemu on a
 # 64bit system which would run then on both x86-32 and x86-64 systems.
 # The latest version of qemu contains new dependencies which
 # currently make it impossible to build such images on 64bit systems
 # We can build a static 64bit qemu but it does not work with
 # the sandboxed translators for unknown reason.
 # So instead we chose to build 32bit shared images.
 #
 
 readonly QEMU_TARBALL=qemu-1.0.1.tar.gz
 readonly QEMU_SHA=4d08b5a83538fcd7b222bec6f1c584da8d12497a
@@ skipping 68 matching lines @@
 #    --static
 
   SubBanner "Make"
   env -i PATH=/usr/bin/:/bin make MAKE_OPTS=${MAKE_OPTS}
 
   SubBanner "Install ${INSTALL_ROOT}"
   cp arm-linux-user/qemu-arm ${INSTALL_ROOT}
   cd ${saved_dir}
   cp tools/trusted_cross_toolchains/qemu_tool_arm.sh ${INSTALL_ROOT}
   ln -sf qemu_tool_arm.sh ${INSTALL_ROOT}/run_under_qemu_arm
+  set +x
 }
 
 #@
-#@ BuildJail <tarball-name>
+#@ BuildJail
 #@
 #@    Build everything and package it
 BuildJail() {
   ClearInstallDir
   InstallMissingArmLibrariesAndHeadersIntoJail \
     ${ARMHF_BASE_DEP_FILES} \
     ${ARMHF_EXTRA_DEP_FILES}
   CleanupJailSymlinks
   HacksAndPatches
   BuildAndInstallQemu
-  CreateTarBall $1
+  CreateTarBall
 }
 
 #
 # GeneratePackageList
 #
 #     Looks up package names in ${TMP}/Packages and write list of URLs
 #     to output file.
 #
 GeneratePackageList() {
   local output_file=$1
@@ skipping 12 matching lines @@
   sort $output_file -o $output_file
 }
 
 #@
 #@ UpdatePackageLists
 #@
 #@     Regenerate the armhf package lists such that they contain an up-to-date
 #@     list of URLs within the ubuntu archive.
 #@
 UpdatePackageLists() {
-  local package_list="${TMP}/Packages.trusty.bz2"
-  local package_list2="${TMP}/Packages.trusty-security.bz2"
+  local package_list="${TMP}/Packages.${DIST}.bz2"
+  local package_list2="${TMP}/Packages.${DIST}-security.bz2"
   DownloadOrCopy ${PACKAGE_LIST} ${package_list}
   DownloadOrCopy ${PACKAGE_LIST2} ${package_list2}
   bzcat ${package_list} ${package_list2} | egrep '^(Package:|Filename:)' > ${TMP}/Packages
 
   GeneratePackageList ${ARMHF_BASE_DEP_LIST} "${ARMHF_BASE_PACKAGES}"
   GeneratePackageList ${ARMHF_EXTRA_DEP_LIST} "${ARMHF_EXTRA_PACKAGES}"
 }
 
 if [[ $# -eq 0 ]] ; then
   echo "ERROR: you must specify a mode on the commandline"
   echo
   Usage
   exit -1
 elif [[ "$(type -t $1)" != "function" ]]; then
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 else
   ChangeDirectory
   SanityCheck
   "$@"
 fi