[MIPS] Update the toolchain script with packages for Chromium

tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.squeeze.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 creates the mips trusted SDK.
 #@ It must be run from the native_client directory.
 
 # This script is intended to build a mipsel-linux-gnu cross compilation
 # toolchain that runs on x86 linux and generates code for a little-endian,
@@ skipping 36 matching lines @@
 readonly INSTALL_ROOT=$(pwd)/toolchain/linux_mips-trusted
 
 readonly TMP=$(pwd)/toolchain/tmp/crosstool-trusted
 
 readonly BUILD_DIR=${TMP}/build
 
 readonly PATCH_MIPS32=$(readlink -f ../third_party/qemu/qemu-0.12.5.patch_mips)
 
 readonly JAIL_MIPS32=${INSTALL_ROOT}/sysroot
 
+readonly CROSS_TARBALL="naclsdk_linux_mipsel-trusted"
+
 # These are simple compiler wrappers to force 32bit builds.
 readonly  CC32=$(readlink -f pnacl/scripts/mygcc32)
 readonly  CXX32=$(readlink -f pnacl/scripts/myg++32)
 
 ######################################################################
 # Helper
 ######################################################################
 
 Banner() {
   echo "######################################################################"
   echo $*
   echo "######################################################################"
 }
 
 SubBanner() {
   echo "......................................................................"
   echo $*
   echo "......................................................................"
 }
 
 Usage() {
   echo
-  echo "$0 trusted_sdk"
+  echo "$0 <trusted_sdk|chrome_sdk>"

[Mark Seaborn, 2013/02/28 20:40:28]

The "trusted" vs. "chrome" naming doesn't really make sense.  Both are trusted. 
"nacl" vs. "chrome" would make more sense.

[petarj, 2013/03/06 00:32:10]

Done. It's "nacl_sdk" vs "chrome_sdk" now.

   echo
-  echo "trusted_sdk - Build everything and package it"
+  echo "trusted_sdk - Build nacl toolchain and package it"
+  echo "chrome_sdk  - Build chrome toolchain and package it"
   echo
 }
 
 CheckoutOrCopy() {
   local url=$1
   local revision=$2
   local filename="${TMP}/${url##*/}"
   local filetype="${url%%:*}"
 
   if [ "${filename}" == "" ]; then
@@ skipping 94 matching lines @@
 }
 
 ClearBuildDir() {
   Banner "clearing dirs in ${BUILD_DIR}"
   rm -rf ${BUILD_DIR}/*
 }
 
 CreateTarBall() {
   local tarball=$1
   Banner "creating tar ball ${tarball}"
-  tar cfz ${tarball}-mips.tgz -C ${INSTALL_ROOT} .
+  tar cfz ${tarball}.tgz -C ${INSTALL_ROOT} .
 }
 
 
 # Download the toolchain source tarballs or use a local copy when available.
 DownloadOrCopyAndInstallToolchain() {
   Banner "Installing toolchain"
 
   local tarball="${TMP}/${BINUTILS_URL##*/}"
   DownloadOrCopyAndVerify ${BINUTILS_URL} ${BINUTILS_SHA1SUM}
   SubBanner "extracting from ${tarball}"
@@ skipping 261 matching lines @@
 readonly REPO_DEBIAN=http://ftp.debian.org/debian
 readonly MIPS32_PACKAGES=${REPO_DEBIAN}/dists/squeeze/main/binary-mipsel/Packages.bz2
 
 readonly TMP_PACKAGELIST_MIPS32=${TMP}/../packagelist_mipsel.tmp
 
 # These are good enough for native client.
 readonly BASE_PACKAGES="\
   libssl0.9.8 \
   libssl-dev \
   libx11-6 \
   libx11-dev \

[Mark Seaborn, 2013/02/28 20:40:28]

NaCl doesn't depend on X11, so can you move this to the Chrome list too, as you
did with libasound?

[petarj, 2013/03/06 00:32:10]

Done. Maybe you will want to change it for ARM too.

   x11proto-core-dev \
   libxt6 \
   libxt-dev \
   zlib1g \
-  zlib1g-dev \
+  zlib1g-dev"
+
+# Packages needed for chrome sysroot.
+readonly CHROME_PACKAGES="\

[Mark Seaborn, 2013/02/28 20:40:28]

Maybe you could move these lists to live in text files?  Then it will be easier
to share them between scripts.  The ARM version puts the lists in text files, in
*.base and *.extra (though as pathnames rather than the cleaner package names
you're using).

[petarj, 2013/03/06 00:32:10]

The change has been made so

packagelist.squeeze.mipsel.base
packagelist.squeeze.mipsel.extra

are created now.

[Mark Seaborn, 2013/03/06 00:43:43]

What I meant was: can you move the lists of packages to live in checked-in text
files, not text files that are generated at run time by the script?

+  comerr-dev \
+  krb5-multidev \
+  libaa1 \
+  libaa1-dev \
   libasound2 \
   libasound2-dev \
-  libaa1 \
-  libaa1-dev \
+  libatk1.0-0 \
+  libatk1.0-dev \
+  libxau6 \
   libxau-dev \
+  libavahi-client3 \
+  libavahi-client-dev \
+  libavahi-common3 \
+  libavahi-common-dev \
+  libbz2-1.0 \
+  libbz2-dev \
+  libcairo2 \
+  libcairo2-dev \
+  libcups2 \
+  libcups2-dev \
+  libdbus-1-3 \
+  libdbus-1-dev \
+  libdbus-glib-1-2 \
+  libdbus-glib-1-dev \
+  libcomerr2 \
+  libexpat1 \
+  libexpat1-dev \
+  libfontconfig1 \
+  libfontconfig1-dev \
+  libfreetype6 \
+  libfreetype6-dev \
+  libgconf2-4 \
+  libgconf2-dev \
+  libgcrypt11 \
+  libgcrypt11-dev \
+  libgnutls26 \
+  libgnutls-dev \
+  libgpg-error0 \
+  libgpg-error-dev \
+  libgssapi-krb5-2 \
+  libgtk2.0-0 \
+  libgtk2.0-dev \
+  libglib2.0-0 \
+  libglib2.0-dev \
+  libgnome-keyring-dev \
+  libjpeg62 \
+  libjpeg62-dev \
+  libk5crypto3 \
+  libkeyutils1 \
+  libkeyutils-dev \
+  libkrb5-3 \
+  libkrb5-dev \
+  libkrb5support0 \
+  libnspr4-0d \
+  libnspr4-dev \
+  libnss3-1d \
+  libnss3-dev \
+  liborbit2 \
+  liborbit2-dev \
+  libpam0g \
+  libpam0g-dev \
+  libpango1.0-0 \
+  libpango1.0-dev \
+  libpci3 \
+  libpci-dev \
+  libpcre3 \
+  libpcre3-dev \
+  libpixman-1-0 \
+  libpixman-1-dev \
+  libpng12-0 \
+  libpng12-dev \
+  libselinux1 \
+  libspeechd2 \
+  libspeechd-dev \
+  libssl0.9.8 \
+  libssl-dev \
+  libtasn1-3 \
+  libtasn1-3-dev \
+  libudev0 \
+  libudev-dev \
+  libx11-6 \
+  libx11-dev \
+  libxext6 \
+  libxext-dev \
   libxau6 \
+  libxau-dev \
   libxcb1 \
   libxcb1-dev \
   libxcb-render0 \
   libxcb-render0-dev \
   libxcb-render-util0 \
   libxcb-render-util0-dev \
   libxcb-shm0 \
   libxcb-shm0-dev \
+  libxcomposite1 \
+  libxcomposite-dev \
+  libxcursor1 \
+  libxcursor-dev \
+  libxdamage1 \
+  libxdamage-dev \
   libxdmcp6 \
   libxdmcp-dev \
+  libxfixes3 \
+  libxfixes-dev \
+  libxi6 \
+  libxi-dev \
+  libxinerama1 \
+  libxinerama-dev \
+  libxrandr2 \
+  libxrandr-dev \
+  libxrender1 \
+  libxrender-dev \
   libxss1 \
-  libxss-dev"
+  libxss-dev \
+  libxt6 \
+  libxt-dev \
+  libxtst6 \
+  libxtst-dev \
+  python2.6 \
+  python2.6-dev \
+  x11proto-core-dev \
+  x11proto-composite-dev \
+  x11proto-damage-dev \
+  x11proto-fixes-dev \
+  x11proto-input-dev \
+  x11proto-kb-dev \
+  x11proto-randr-dev \
+  x11proto-record-dev \
+  x11proto-render-dev \
+  x11proto-scrnsaver-dev \
+  x11proto-xext-dev \
+  zlib1g \
+  zlib1g-dev"
 
 GeneratePackageLists() {
-  Banner "generating package lists for mips32"
+  readonly sdk_target=$1
+  local packages=
+  Banner "generating ${sdk_target} package lists for mips32"
   echo -n > ${TMP_PACKAGELIST_MIPS32}
   DownloadOrCopy ${MIPS32_PACKAGES}
   bzcat ${TMP}/Packages.bz2\
     | egrep '^(Package:|Filename:)' > ${TMP}/Packages_mipsel
-  for pkg in ${BASE_PACKAGES} ; do
+
+  if [ ${sdk_target} == "trusted_sdk" ] ; then
+    packages=${BASE_PACKAGES}
+  elif [ ${sdk_target} == "chrome_sdk" ] ; then
+    packages=${CHROME_PACKAGES}
+  else
+    Banner "ERROR: Packages for \"${sdk_taget}\" not defined."
+    exit -1
+  fi
+
+  for pkg in ${packages} ; do
     grep  -A 1 "${pkg}\$" ${TMP}/Packages_mipsel\
       | egrep -o "pool/.*" >> ${TMP_PACKAGELIST_MIPS32}
   done
 }
 
 InstallMissingLibraries() {
   readonly DEP_FILES_NEEDED_MIPS32=$(cat ${TMP_PACKAGELIST_MIPS32})
   for file in ${DEP_FILES_NEEDED_MIPS32} ; do
     local package="${TMP}/${file##*/}"
     Banner "installing ${file}"
@@ skipping 25 matching lines @@
 
   rm -f librt.so
   ln -s ../../lib/librt.so.1 librt.so
 
   rm -f libpcre.so
   ln -s ../../lib/libpcre.so.3  libpcre.so
 
   rm -f libresolv.so
   ln -s ../../lib/libresolv.so.2  libresolv.so
 
+  rm -f libglib-2.0.so
+  ln -s ../../lib/libglib-2.0.so.0 libglib-2.0.so
+
+  rm -f libudev.so
+  ln -s ../../lib/libudev.so.0 libudev.so
+
+  rm -f libcom_err.so
+  ln -s ../../lib/libcom_err.so.2 libcom_err.so
+
+  rm -f libXdmcp.so
+  ln -s ../../lib/libXdmcp.so.6 libXdmcp.so
+
+  rm -f libstdc++.so*
   ln -s ../../../mipsel-linux-gnu/lib/libstdc++.so.6.0.17 .
   ln -s libstdc++.so.6.0.17 libstdc++.so.6
   ln -s libstdc++.so.6.0.17 libstdc++.so
 
+  rm -f libgcc_s.so*
   ln -s ../../../mipsel-linux-gnu/lib/libgcc_s.so.1 .
   ln -s libgcc_s.so.1 libgcc_s.so
 }
 
 BuildAndInstallQemu() {
   local saved_dir=$(pwd)
   local tmpdir="${TMP}/qemu-mips.nacl"
   local tarball="qemu-0.12.5.tar.gz"
 
   Banner "Building qemu in ${tmpdir}"
@@ skipping 49 matching lines @@
   echo
   Usage
   exit -1
 
 elif [[ $1 == "trusted_sdk" ]]; then
   mkdir -p ${TMP}
   SanityCheck
   ClearInstallDir
   ClearBuildDir
   DownloadOrCopyAndInstallToolchain
-  GeneratePackageLists
+  GeneratePackageLists $1
   InstallMissingLibraries
   InstallTrustedLinkerScript
   BuildAndInstallQemu
   CreateTarBall $1
 
+elif [[ $1 == "chrome_sdk" ]]; then
+  mkdir -p ${TMP}
+  SanityCheck
+  ClearInstallDir
+  ClearBuildDir
+  DownloadOrCopyAndInstallToolchain
+  GeneratePackageLists $1
+  InstallMissingLibraries

[Mark Seaborn, 2013/02/28 20:40:28]

Duplicating this list of actions is rather icky.  You're omitting
InstallTrustedLinkerScript and BuildAndInstallQemu.  Why not just do those two,
so that chrome_sdk is a superset of the NaCl version?  Or unify the two and put
those steps inside an "if"?

[petarj, 2013/03/06 00:32:10]

Done.

+  CreateTarBall ${CROSS_TARBALL}
+
 else
   Usage
   exit -1
 
 fi