Prep for update to latest QEMU version

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.
@@ skipping 388 matching lines @@
 # Historic Notes:
 # Traditionally we were builidng 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=$(readlink -f ../third_party/qemu/qemu-1.0.1.tar.gz)
-readonly QEMU_PATCH=$(readlink -f ../third_party/qemu/qemu-1.0.1.patch_arm)
+readonly QEMU_TARBALL=qemu-1.0.1.tar.gz
+readonly QEMU_SHA=4d08b5a83538fcd7b222bec6f1c584da8d12497a
 readonly QEMU_DIR=qemu-1.0.1
 
+# TODO(sbc): update to version 2.3.0
+#readonly QEMU_TARBALL=qemu-2.3.0.tar.bz2
+#readonly QEMU_SHA=373d74bfafce1ca45f85195190d0a5e22b29299e
+#readonly QEMU_DIR=qemu-2.3.0
+
+readonly QEMU_URL=http://wiki.qemu-project.org/download/${QEMU_TARBALL}
+readonly QEMU_PATCH=$(readlink -f ../third_party/qemu/${QEMU_DIR}.patch_arm)
+
+
 BuildAndInstallQemu() {
   local saved_dir=$(pwd)
   local tmpdir="${TMP}/qemu.nacl"
 
+  set -x
   Banner "Building qemu in ${tmpdir}"
 
-  if [[ -z "$QEMU_TARBALL" ]] ; then
-    echo "ERROR: missing qemu tarball: ../third_party/qemu/qemu-1.0.1.tar.gz"
-    exit 1
+  if [ -n "${QEMU_URL}" ]; then
+    if [[ ! -f ${TMP}/${QEMU_TARBALL} ]]; then
+      wget -O ${TMP}/${QEMU_TARBALL} $QEMU_URL

[bradn, 2015/04/28 20:46:16]

curl?

[Sam Clegg, 2015/04/28 21:08:32]

Any reason why thats better?

[bradn, 2015/04/28 21:11:08]

consistency, I thought we use curl in most places.
But actually at a glance nacl's an even split
it's in naclports we just use curl.
So, nevermind.

+    fi
+
+    echo "${QEMU_SHA}  ${TMP}/${QEMU_TARBALL}" | sha1sum --check -
+  else
+    if [[ ! -f "$QEMU_TARBALL" ]] ; then
+      echo "ERROR: missing qemu tarball: $QEMU_TARBALL"
+      exit 1
+    fi
   fi
 
   rm -rf ${tmpdir}
   mkdir ${tmpdir}
   cd ${tmpdir}
   SubBanner "Untaring ${QEMU_TARBALL}"
-  tar zxf ${QEMU_TARBALL}
+  tar xf ${TMP}/${QEMU_TARBALL}
   cd ${QEMU_DIR}
 
   SubBanner "Patching ${QEMU_PATCH}"
   patch -p1 < ${QEMU_PATCH}
 
   SubBanner "Configuring"
   env -i PATH=/usr/bin/:/bin LIBS=-lrt \
     ./configure \
     --extra-cflags="-m32" \
-    --extra-ldflags="-Wl,-rpath=/lib32" \
     --disable-system \
     --disable-docs \
     --enable-linux-user \
-    --disable-darwin-user \
     --disable-bsd-user \
     --target-list=arm-linux-user \
     --disable-smartcard-nss \
     --disable-sdl
 
 # see above for why we can no longer use -static
 #    --static
 
   SubBanner "Make"
-  env -i PATH=/usr/bin/:/bin \
-      V=99 make MAKE_OPTS=${MAKE_OPTS}
+  env -i PATH=/usr/bin/:/bin V=99 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
 }
 
 #@
 #@ BuildJail <tarball-name>
@@ skipping 58 matching lines @@
 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