Linux: Fix up sysroot_scripts.

build/linux/sysroot_scripts/sysroot-creator.sh

 # Copyright 2014 The Chromium 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 should not be run directly but sourced by the other
 # scripts (e.g. sysroot-creator-trusty.sh).  Its up to the parent scripts
 # to define certain environment variables: e.g.
 #  DISTRO=ubuntu
 #  DIST=trusty
 #  APT_REPO=http://archive.ubuntu.com/ubuntu
 #  KEYRING_FILE=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 #  DEBIAN_PACKAGES="gcc libz libssl"
 
-#@ This script builds a Debian sysroot images for building Google Chrome.
+#@ This script builds Debian/Ubuntu sysroot images for building Google Chrome.
 #@
 #@  Generally this script is invoked as:
 #@  sysroot-creator-<flavour>.sh <mode> <args>*
 #@  Available modes are shown below.
 #@
 #@ List of modes:
 
 ######################################################################
 # Config
 ######################################################################
@@ skipping 17 matching lines @@
   echo "error: KEYRING_FILE not defined"
   exit 1
 fi
 
 if [ -z "${DEBIAN_PACKAGES:-}" ]; then
   echo "error: DEBIAN_PACKAGES not defined"
   exit 1
 fi
 
 readonly REPO_BASEDIR="${APT_REPO}/dists/${DIST}"
+readonly REPO_BASEDIR_ARM=${REPO_BASEDIR_ARM:=$REPO_BASEDIR}
+readonly REPO_BASEDIR_ARM64=${REPO_BASEDIR_ARM64:=$REPO_BASEDIR}
+readonly REPO_BASEDIR_MIPS=${REPO_BASEDIR_MIPS:=$REPO_BASEDIR}
+
+readonly HAS_ARCH_AMD64=${HAS_ARCH_AMD64:=0}
+readonly HAS_ARCH_I386=${HAS_ARCH_I386:=0}
+readonly HAS_ARCH_ARM=${HAS_ARCH_ARM:=0}
+readonly HAS_ARCH_ARM64=${HAS_ARCH_ARM64:=0}
+readonly HAS_ARCH_MIPS=${HAS_ARCH_MIPS:=0}
 
 readonly REQUIRED_TOOLS="wget"
 
 ######################################################################
 # Package Config
 ######################################################################
 
 PACKAGES_EXT=${PACKAGES_EXT:-bz2}
 readonly RELEASE_FILE="Release"
 readonly RELEASE_FILE_GPG="Release.gpg"
 readonly RELEASE_LIST="${REPO_BASEDIR}/${RELEASE_FILE}"
 readonly RELEASE_LIST_GPG="${REPO_BASEDIR}/${RELEASE_FILE_GPG}"
 readonly PACKAGE_FILE_AMD64="main/binary-amd64/Packages.${PACKAGES_EXT}"
 readonly PACKAGE_FILE_I386="main/binary-i386/Packages.${PACKAGES_EXT}"
 readonly PACKAGE_FILE_ARM="main/binary-armhf/Packages.${PACKAGES_EXT}"
 readonly PACKAGE_FILE_ARM64="main/binary-arm64/Packages.${PACKAGES_EXT}"
 readonly PACKAGE_FILE_MIPS="main/binary-mipsel/Packages.${PACKAGES_EXT}"
 readonly PACKAGE_LIST_AMD64="${REPO_BASEDIR}/${PACKAGE_FILE_AMD64}"
 readonly PACKAGE_LIST_I386="${REPO_BASEDIR}/${PACKAGE_FILE_I386}"
-readonly PACKAGE_LIST_ARM="${REPO_BASEDIR}/${PACKAGE_FILE_ARM}"
-readonly PACKAGE_LIST_ARM64="${REPO_BASEDIR}/${PACKAGE_FILE_ARM64}"
-readonly PACKAGE_LIST_MIPS="${REPO_BASEDIR}/${PACKAGE_FILE_MIPS}"
+readonly PACKAGE_LIST_ARM="${REPO_BASEDIR_ARM}/${PACKAGE_FILE_ARM}"
+readonly PACKAGE_LIST_ARM64="${REPO_BASEDIR_ARM64}/${PACKAGE_FILE_ARM64}"
+readonly PACKAGE_LIST_MIPS="${REPO_BASEDIR_MIPS}/${PACKAGE_FILE_MIPS}"
 
 readonly DEBIAN_DEP_LIST_AMD64="packagelist.${DIST}.amd64"
 readonly DEBIAN_DEP_LIST_I386="packagelist.${DIST}.i386"
 readonly DEBIAN_DEP_LIST_ARM="packagelist.${DIST}.arm"
 readonly DEBIAN_DEP_LIST_ARM64="packagelist.${DIST}.arm64"
 readonly DEBIAN_DEP_LIST_MIPS="packagelist.${DIST}.mipsel"
 
 ######################################################################
 # Helper
 ######################################################################
@@ skipping 99 matching lines @@
   rm -rf ${INSTALL_ROOT}/*
 }
 
 
 CreateTarBall() {
   Banner "Creating tarball ${TARBALL}"
   tar zcf ${TARBALL} -C ${INSTALL_ROOT} .
 }
 
 ExtractPackageBz2() {
-  if [ "${PACKAGES_EXT}" == "bz2" ]; then
+  if [ "${PACKAGES_EXT}" = "bz2" ]; then
     bzcat "$1" | egrep '^(Package:|Filename:|SHA256:) ' > "$2"
   else
     xzcat "$1" | egrep '^(Package:|Filename:|SHA256:) ' > "$2"
   fi
 }
 
 GeneratePackageListAmd64() {
   local output_file="$1"
   local package_list="${BUILD_DIR}/Packages.${DIST}_amd64.${PACKAGES_EXT}"
   local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_amd64"
   DownloadOrCopy "${PACKAGE_LIST_AMD64}" "${package_list}"
   VerifyPackageListing "${PACKAGE_FILE_AMD64}" "${package_list}"
   ExtractPackageBz2 "$package_list" "$tmp_package_list"
   GeneratePackageList "$tmp_package_list" "$output_file" "${DEBIAN_PACKAGES}
-    ${DEBIAN_PACKAGES_X86} ${DEBIAN_PACKAGES_AMD64}"
+    ${DEBIAN_PACKAGES_X86:=} ${DEBIAN_PACKAGES_AMD64:=}"
 }
 
 GeneratePackageListI386() {
   local output_file="$1"
   local package_list="${BUILD_DIR}/Packages.${DIST}_i386.${PACKAGES_EXT}"
   local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_amd64"
   DownloadOrCopy "${PACKAGE_LIST_I386}" "${package_list}"
   VerifyPackageListing "${PACKAGE_FILE_I386}" "${package_list}"
   ExtractPackageBz2 "$package_list" "$tmp_package_list"
   GeneratePackageList "$tmp_package_list" "$output_file" "${DEBIAN_PACKAGES}
-    ${DEBIAN_PACKAGES_X86}"
+    ${DEBIAN_PACKAGES_X86:=}"
 }
 
 GeneratePackageListARM() {
   local output_file="$1"
   local package_list="${BUILD_DIR}/Packages.${DIST}_arm.${PACKAGES_EXT}"
   local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_arm"
   DownloadOrCopy "${PACKAGE_LIST_ARM}" "${package_list}"
   VerifyPackageListing "${PACKAGE_FILE_ARM}" "${package_list}"
   ExtractPackageBz2 "$package_list" "$tmp_package_list"
   GeneratePackageList "$tmp_package_list" "$output_file" "${DEBIAN_PACKAGES}
-    ${DEBIAN_PACKAGES_ARM}"
+    ${DEBIAN_PACKAGES_ARM:=}"
 }
 
-function GeneratePackageListARM64() {
+GeneratePackageListARM64() {
   local output_file="$1"
   local package_list="${BUILD_DIR}/Packages.${DIST}_arm64.${PACKAGES_EXT}"
   local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_arm64"
   DownloadOrCopy "${PACKAGE_LIST_ARM64}" "${package_list}"
   VerifyPackageListing "${PACKAGE_FILE_ARM64}" "${package_list}"
   ExtractPackageBz2 "$package_list" "$tmp_package_list"
   GeneratePackageList "$tmp_package_list" "$output_file" "${DEBIAN_PACKAGES}
-    ${DEBIAN_PACKAGES_ARM64}"
+    ${DEBIAN_PACKAGES_ARM64:=}"
 }
 
 GeneratePackageListMips() {
   local output_file="$1"
   local package_list="${BUILD_DIR}/Packages.${DIST}_mips.${PACKAGES_EXT}"
   local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_mips"
   DownloadOrCopy "${PACKAGE_LIST_MIPS}" "${package_list}"
   VerifyPackageListing "${PACKAGE_FILE_MIPS}" "${package_list}"
   ExtractPackageBz2 "$package_list" "$tmp_package_list"
   GeneratePackageList "$tmp_package_list" "$output_file" "${DEBIAN_PACKAGES}"
@@ skipping 81 matching lines @@
   sed -i -e 's|/lib/arm-linux-gnueabihf/||g' ${lscripts}
 
   # This is for chrome's ./build/linux/pkg-config-wrapper
   # which overwrites PKG_CONFIG_LIBDIR internally
   SubBanner "Move pkgconfig files"
   mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
   mv ${INSTALL_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/* \
       ${INSTALL_ROOT}/usr/lib/pkgconfig
 }
 
-function HacksAndPatchesARM64() {
+HacksAndPatchesARM64() {
   Banner "Misc Hacks & Patches"
   # these are linker scripts with absolute pathnames in them
   # which we rewrite here
   lscripts="${INSTALL_ROOT}/usr/lib/aarch64-linux-gnu/libpthread.so \
             ${INSTALL_ROOT}/usr/lib/aarch64-linux-gnu/libc.so"
 
   # Rewrite linker scripts
   sed -i -e 's|/usr/lib/aarch64-linux-gnu/||g' ${lscripts}
   sed -i -e 's|/lib/aarch64-linux-gnu/||g' ${lscripts}
 
@@ skipping 66 matching lines @@
 }
 
 
 CleanupJailSymlinks() {
   Banner "Jail symlink cleanup"
 
   SAVEDPWD=$(pwd)
   cd ${INSTALL_ROOT}
   local libdirs="lib usr/lib"
   if [ "${ARCH}" != "MIPS" ]; then
-    libdirs+=" lib64"
+    libdirs="${libdirs} lib64"
   fi
   find $libdirs -type l -printf '%p %l\n' | while read link target; do
     # skip links with non-absolute paths
     echo "${target}" | grep -qs ^/ || continue
     echo "${link}: ${target}"
     case "${link}" in
       usr/lib/gcc/*-linux-gnu/4.*/* | usr/lib/gcc/arm-linux-gnueabihf/4.*/* |\
       usr/lib/gcc/aarch64-linux-gnu/4.*/*)
         # Relativize the symlink.
         ln -snfv "../../../../..${target}" "${link}"
@@ skipping 22 matching lines @@
     fi
   done
   cd "$SAVEDPWD"
 }
 
 #@
 #@ BuildSysrootAmd64
 #@
 #@    Build everything and package it
 BuildSysrootAmd64() {
+  if [ "$HAS_ARCH_AMD64" = "0" ]; then
+    return
+  fi
   ClearInstallDir
   local package_file="$BUILD_DIR/package_with_sha256sum_amd64"
   GeneratePackageListAmd64 "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_AMD64"
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesAmd64
   CreateTarBall
 }
 
 #@
 #@ BuildSysrootI386
 #@
 #@    Build everything and package it
 BuildSysrootI386() {
+  if [ "$HAS_ARCH_I386" = "0" ]; then
+    return
+  fi
   ClearInstallDir
   local package_file="$BUILD_DIR/package_with_sha256sum_i386"
   GeneratePackageListI386 "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_I386"
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesI386
   CreateTarBall
 }
 
 #@
 #@ BuildSysrootARM
 #@
 #@    Build everything and package it
 BuildSysrootARM() {
+  if [ "$HAS_ARCH_ARM" = "0" ]; then
+    return
+  fi
   ClearInstallDir
   local package_file="$BUILD_DIR/package_with_sha256sum_arm"
   GeneratePackageListARM "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_ARM"
-  APT_REPO=${APR_REPO_ARM:=$APT_REPO}
+  APT_REPO=${APT_REPO_ARM:=$APT_REPO}
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesARM
   CreateTarBall
 }
 
 #@
 #@ BuildSysrootARM64
 #@
 #@    Build everything and package it
-function BuildSysrootARM64() {
+BuildSysrootARM64() {
+  if [ "$HAS_ARCH_ARM64" = "0" ]; then
+    return
+  fi
   ClearInstallDir
   local package_file="$BUILD_DIR/package_with_sha256sum_arm64"
   GeneratePackageListARM64 "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_ARM64"
-  APT_REPO=${APR_REPO_ARM64:=$APT_REPO}
+  APT_REPO=${APT_REPO_ARM64:=$APT_REPO}
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesARM64
   CreateTarBall
 }
 
 
 #@
 #@ BuildSysrootMips
 #@
 #@    Build everything and package it
 BuildSysrootMips() {
+  if [ "$HAS_ARCH_MIPS" = "0" ]; then
+    return
+  fi
   ClearInstallDir
   local package_file="$BUILD_DIR/package_with_sha256sum_arm"
   GeneratePackageListMips "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_MIPS"
-  APT_REPO=${APR_REPO_MIPS:=$APT_REPO}
+  APT_REPO=${APT_REPO_MIPS:=$APT_REPO}
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesMips
   CreateTarBall
 }
 
 #@
 #@ BuildSysrootAll
 #@
 #@    Build sysroot images for all architectures
@@ skipping 13 matching lines @@
   set -x
   gsutil cp -a public-read "${TARBALL}" \
       "gs://chrome-linux-sysroot/toolchain/$rev/"
   set +x
 }
 
 #@
 #@ UploadSysrootAmd64 <revision>
 #@
 UploadSysrootAmd64() {
+  if [ "$HAS_ARCH_AMD64" = "0" ]; then
+    return
+  fi
   UploadSysroot "$@"
 }
 
 #@
 #@ UploadSysrootI386 <revision>
 #@
 UploadSysrootI386() {
+  if [ "$HAS_ARCH_I386" = "0" ]; then
+    return
+  fi
   UploadSysroot "$@"
 }
 
 #@
 #@ UploadSysrootARM <revision>
 #@
 UploadSysrootARM() {
+  if [ "$HAS_ARCH_ARM" = "0" ]; then
+    return
+  fi
   UploadSysroot "$@"
 }
 
 #@
 #@ UploadSysrootARM64 <revision>
 #@
-function UploadSysrootARM64() {
+UploadSysrootARM64() {
+  if [ "$HAS_ARCH_ARM64" = "0" ]; then
+    return
+  fi
   UploadSysroot "$@"
 }
 
 #@
 #@ UploadSysrootMips <revision>
 #@
 UploadSysrootMips() {
+  if [ "$HAS_ARCH_MIPS" = "0" ]; then
+    return
+  fi
   UploadSysroot "$@"
 }
 
 #@
 #@ UploadSysrootAll <revision>
 #@
 #@    Upload sysroot image for all architectures
 UploadSysrootAll() {
   RunCommand UploadSysrootAmd64 "$@"
   RunCommand UploadSysrootI386 "$@"
@@ skipping 79 matching lines @@
   # sort -o does an in-place sort of this file
   sort "$output_file" -o "$output_file"
 }
 
 #@
 #@ UpdatePackageListsAmd64
 #@
 #@     Regenerate the package lists such that they contain an up-to-date
 #@     list of URLs within the Debian archive. (For amd64)
 UpdatePackageListsAmd64() {
+  if [ "$HAS_ARCH_AMD64" = "0" ]; then
+    return
+  fi
   GeneratePackageListAmd64 "$DEBIAN_DEP_LIST_AMD64"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_AMD64"
 }
 
 #@
 #@ UpdatePackageListsI386
 #@
 #@     Regenerate the package lists such that they contain an up-to-date
 #@     list of URLs within the Debian archive. (For i386)
 UpdatePackageListsI386() {
+  if [ "$HAS_ARCH_I386" = "0" ]; then
+    return
+  fi
   GeneratePackageListI386 "$DEBIAN_DEP_LIST_I386"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_I386"
 }
 
 #@
 #@ UpdatePackageListsARM
 #@
 #@     Regenerate the package lists such that they contain an up-to-date
 #@     list of URLs within the Debian archive. (For arm)
 UpdatePackageListsARM() {
+  if [ "$HAS_ARCH_ARM" = "0" ]; then
+    return
+  fi
   GeneratePackageListARM "$DEBIAN_DEP_LIST_ARM"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_ARM"
 }
 
 #@
 #@ UpdatePackageListsARM64
 #@
 #@     Regenerate the package lists such that they contain an up-to-date
 #@     list of URLs within the Debian archive. (For arm)
-function UpdatePackageListsARM64() {
+UpdatePackageListsARM64() {
+  if [ "$HAS_ARCH_ARM64" = "0" ]; then
+    return
+  fi
   GeneratePackageListARM64 "$DEBIAN_DEP_LIST_ARM64"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_ARM64"
 }
 
 #@
 #@ UpdatePackageListsMips
 #@
 #@     Regenerate the package lists such that they contain an up-to-date
 #@     list of URLs within the Debian archive. (For arm)
 UpdatePackageListsMips() {
+  if [ "$HAS_ARCH_MIPS" = "0" ]; then
+    return
+  fi
   GeneratePackageListMips "$DEBIAN_DEP_LIST_MIPS"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_MIPS"
 }
 
 #@
 #@ UpdatePackageListsAll
 #@
 #@    Regenerate the package lists for all architectures.
 UpdatePackageListsAll() {
   RunCommand UpdatePackageListsAmd64
@@ skipping 20 matching lines @@
   echo "    $0 help"
   exit 1
 else
   ChangeDirectory
   if echo $1 | grep -qs "All$"; then
     "$@"
   else
     RunCommand "$@"
   fi
 fi