Linux: Refactor sysroot-creator

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
@@ skipping 31 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_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 106 matching lines @@
 }
 
 ExtractPackageBz2() {
   if [ "${PACKAGES_EXT}" = "bz2" ]; then
     bzcat "$1" | egrep '^(Package:|Filename:|SHA256:) ' > "$2"
   else
     xzcat "$1" | egrep '^(Package:|Filename:|SHA256:) ' > "$2"
   fi
 }
 
+GeneratePackageListCommon() {
+  local output_file="$1"
+  local arch="$2"
+  local apt_repo="$3"
+  local packages="$4"
+
+  local repo_basedir="${apt_repo}/dists/${DIST}"
+  local package_list="${BUILD_DIR}/Packages.${DIST}_${arch}.${PACKAGES_EXT}"
+  local tmp_package_list="${BUILD_DIR}/Packages.${DIST}_${arch}"
+  local package_file_arch="main/binary-${arch}/Packages.${PACKAGES_EXT}"
+  local package_list_arch="${repo_basedir}/${package_file_arch}"
+
+  DownloadOrCopy "${package_list_arch}" "${package_list}"
+  VerifyPackageListing "${package_file_arch}" "${package_list}"
+  ExtractPackageBz2 "$package_list" "$tmp_package_list"
+  GeneratePackageList "$tmp_package_list" "$output_file" "${packages}"
+}
+
 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}
+  GeneratePackageListCommon "$1" amd64 ${APT_REPO} "${DEBIAN_PACKAGES}
     ${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}
+  GeneratePackageListCommon "$1" i386 ${APT_REPO} "${DEBIAN_PACKAGES}
     ${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:=}"
+  GeneratePackageListCommon "$1" armhf ${APT_REPO_ARM:-${APT_REPO}} \
+                            "${DEBIAN_PACKAGES} ${DEBIAN_PACKAGES_ARM:=}"
 }
 
 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:=}"
+  GeneratePackageListCommon "$1" arm64 ${APT_REPO_ARM64:-${APT_REPO}} \
+                            "${DEBIAN_PACKAGES} ${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}"
+  GeneratePackageListCommon "$1" mipsel ${APT_REPO_MIPS:-${APT_REPO}} \
+                            "${DEBIAN_PACKAGES}"
 }
 
 StripChecksumsFromPackageList() {
   local package_file="$1"
   sed -i 's/ [a-f0-9]\{64\}$//' "$package_file"
 }
 
 VerifyPackageFilesMatch() {
   local downloaded_package_file="$1"
   local stored_package_file="$2"
@@ skipping 506 matching lines @@
     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)
+#@     list of URLs within the Debian archive. (For arm64)
 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)
+#@     list of URLs within the Debian archive. (For mips)
 UpdatePackageListsMips() {
   if [ "$HAS_ARCH_MIPS" = "0" ]; then
     return
   fi
   GeneratePackageListMips "$DEBIAN_DEP_LIST_MIPS"
   StripChecksumsFromPackageList "$DEBIAN_DEP_LIST_MIPS"
 }
 
 #@
 #@ UpdatePackageListsAll
@@ skipping 24 matching lines @@
   echo "    $0 help"
   exit 1
 else
   ChangeDirectory
   if echo $1 | grep -qs "All$"; then
     "$@"
   else
     RunCommand "$@"
   fi
 fi