Sysroot: Add build_and_upload.py

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
+#  DIST_UPDATES=trusty-updates
 #  APT_REPO=http://archive.ubuntu.com/ubuntu
 #  KEYRING_FILE=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 #  DEBIAN_PACKAGES="gcc libz libssl"
 
 #@ 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.
 #@
@@ skipping 76 matching lines @@
 DownloadOrCopy() {
   if [ -f "$2" ] ; then
     echo "$2 already in place"
     return
   fi
 
   HTTP=0
   echo "$1" | grep -qs ^http:// && HTTP=1
   if [ "$HTTP" = "1" ]; then
     SubBanner "downloading from $1 -> $2"
-    wget "$1" -O "${2}.partial"
-    mv "${2}.partial" $2
+    # Appending the "$$" shell pid is necessary here to prevent concurrent
+    # instances of sysroot-creator.sh from trying to write to the same file.
+    wget "$1" -O "${2}.partial.$$"
+    mv "${2}.partial.$$" $2

[Sam Clegg, 2016/12/12 22:11:52]

Under what circumstances might that happen?   Shouldn't every instance doesn't
distinct files?

If two instances are racing to create $2 isn't that still a problem?

[Tom (Use chromium acct), 2016/12/13 00:06:19]

It happens when downloading eg jessie-Release and jessie-Release.gpg, and when
packages are the same across architectures, like
debian-packages/x11proto-composite-dev_0.4.2-2_all.deb
No because mv is atomic

   else
     SubBanner "copying from $1"
     cp "$1" "$2"
   fi
 }
 
 
 SetEnvironmentVariables() {
   ARCH=""
   echo $1 | grep -qs Amd64$ && ARCH=AMD64
@@ skipping 429 matching lines @@
 
 #@
 #@ 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"
+  local package_file="$BUILD_DIR/package_with_sha256sum_mips"
   GeneratePackageListMips "$package_file"
   local files_and_sha256sums="$(cat ${package_file})"
   StripChecksumsFromPackageList "$package_file"
   VerifyPackageFilesMatch "$package_file" "$DEBIAN_DEP_LIST_MIPS"
   APT_REPO=${APT_REPO_MIPS:=$APT_REPO}
   InstallIntoSysroot ${files_and_sha256sums}
   CleanupJailSymlinks
   HacksAndPatchesMips
   CreateTarBall
 }
@@ skipping 238 matching lines @@
 #@
 #@    Regenerate the package lists for all architectures.
 UpdatePackageListsAll() {
   RunCommand UpdatePackageListsAmd64
   RunCommand UpdatePackageListsI386
   RunCommand UpdatePackageListsARM
   RunCommand UpdatePackageListsARM64
   RunCommand UpdatePackageListsMips
 }
 
+DumpStringsStderr() {
+  echo "$1" | xargs echo | tr ' ' '\n' | sort 1>&2
+}
+
+#@
+#@ DumpPackageListsAmd64
+#@
+#@    Prints required packages for amd64 architecture to stderr.
+DumpPackageListsAmd64() {
+  DumpStringsStderr "${DEBIAN_PACKAGES} ${DEBIAN_PACKAGES_X86:=}
+                    ${DEBIAN_PACKAGES_AMD64:=}"
+}
+
+#@
+#@ DumpPackageListsI386
+#@
+#@    Prints required packages for i386 architecture to stderr.
+DumpPackageListsI386() {
+  DumpStringsStderr "${DEBIAN_PACKAGES} ${DEBIAN_PACKAGES_X86:=}"
+}
+
+#@
+#@ DumpPackageListsARM
+#@
+#@    Prints required packages for arm architecture to stderr.
+DumpPackageListsARM() {
+  DumpStringsStderr "${DEBIAN_PACKAGES} ${DEBIAN_PACKAGES_ARM:=}"
+}
+
+#@
+#@ DumpPackageListsARM64
+#@
+#@    Prints required packages for arm64 architecture to stderr.
+DumpPackageListsARM64() {
+  DumpStringsStderr "${DEBIAN_PACKAGES} ${DEBIAN_PACKAGES_ARM64:=}"
+}
+
+#@
+#@ DumpPackageListsMips
+#@
+#@    Prints required packages for mips architecture to stderr.
+DumpPackageListsMips() {
+  DumpStringsStderr "${DEBIAN_PACKAGES}"
+}

[Sam Clegg, 2016/12/12 22:11:52]

Are any of these new Dump* functions used anywhere?

[Tom (Use chromium acct), 2016/12/13 00:06:19]

No, forgot to remove them :)

+
+#@
+#@ PrintArchitectures
+#@
+#@    Prints supported architectures.
+PrintArchitectures() {
+  if [ "$HAS_ARCH_AMD64" = "1" ]; then
+    echo Amd64
+  fi
+  if [ "$HAS_ARCH_I386" = "1" ]; then
+    echo I386
+  fi
+  if [ "$HAS_ARCH_ARM" = "1" ]; then
+    echo ARM
+  fi
+  if [ "$HAS_ARCH_ARM64" = "1" ]; then
+    echo ARM64
+  fi
+  if [ "$HAS_ARCH_MIPS" = "1" ]; then
+    echo Mips
+  fi
+}
+
+#@
+#@ PrintDistro
+#@
+#@    Prints distro.  eg: ubuntu
+PrintDistro() {
+  echo ${DISTRO}
+}
+
+#@
+#@ DumpRelease
+#@
+#@    Prints disto release.  eg: trusty
+PrintRelease() {
+  echo ${DIST}
+}
+
 RunCommand() {
   SetEnvironmentVariables "$1"
   SanityCheck
   "$@"
 }
 
 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
-  if echo $1 | grep -qs "All$"; then
+  if echo $1 | grep -qs --regexp='\(^Print\)\|\(All$\)'; then
     "$@"
   else
     RunCommand "$@"
   fi
 fi