Switch to GPT partition format.

src/scripts/common.sh

 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 13 matching lines @@
   true
 elif [ "x$COMMON_SH" != "x" ]
 then
   # COMMON_SH set, so assume that's us
   GCLIENT_ROOT="$(dirname "$COMMON_SH")/../.."
 elif [ "x$BASH_SOURCE" != "x" ]
 then
   # Using bash, so we can find ourselves
   GCLIENT_ROOT="$(dirname "$BASH_SOURCE")/../.."
 else
-  # Using dash or sh, we don't know where we are.  $0 refers to the calling 
+  # Using dash or sh, we don't know where we are.  $0 refers to the calling
   # script, not ourselves, so that doesn't help us.
   echo "Unable to determine location for common.sh.  If you are sourcing"
   echo "common.sh from a script run via dash or sh, you must do it in the"
   echo "following way:"
   echo '  COMMON_SH="$(dirname "$0")/../../scripts/common.sh"'
   echo '  . "$COMMON_SH"'
   echo "where the first line is the relative path from your script to"
   echo "common.sh."
   exit 1
 fi
 
 # Canonicalize the directories for the root dir and the calling script.
 # readlink is part of coreutils and should be present even in a bare chroot.
-# This is better than just using 
+# This is better than just using
 #     FOO = "$(cd $FOO ; pwd)"
-# since that leaves symbolic links intact.  
+# since that leaves symbolic links intact.
 # Note that 'realpath' is equivalent to 'readlink -f'.
 TOP_SCRIPT_DIR=`readlink -f $TOP_SCRIPT_DIR`
 GCLIENT_ROOT=`readlink -f $GCLIENT_ROOT`
 
 # Other directories should always be pathed down from GCLIENT_ROOT.
 SRC_ROOT="$GCLIENT_ROOT/src"
 SRC_INTERNAL="$GCLIENT_ROOT/src-internal"
 SCRIPTS_DIR="$SRC_ROOT/scripts"
 
 # Load developer's custom settings.  Default location is in scripts dir,
 # since that's available both inside and outside the chroot.  By convention,
 # settings from this file are variables starting with 'CHROMEOS_'
 CHROMEOS_DEV_SETTINGS="${CHROMEOS_DEV_SETTINGS:-$SCRIPTS_DIR/.chromeos_dev}"
 if [ -f $CHROMEOS_DEV_SETTINGS ]
 then
   # Turn on exit-on-error during custom settings processing
   SAVE_OPTS=`set +o`
   set -e
 
   # Read settings
   . $CHROMEOS_DEV_SETTINGS
 
   # Restore previous state of exit-on-error
   eval "$SAVE_OPTS"
 fi
 
 # Load shflags
-. "$SRC_ROOT/third_party/shflags/files/src/shflags"
+if [ -f "${TOP_SCRIPT_DIR}/shflags" ]; then
+  . shflags
+else
+  . "$SRC_ROOT/third_party/shflags/files/src/shflags"
+fi
 
 # Mirrors and build suites come in 3 flavors
 #   EXT - external source used to build local package repository
 #   DEV - development chroot, from local package repository
 #   IMG - bootable image, from local package repository
 
 # Build suites
 DEFAULT_EXT_SUITE=${CHROMEOS_EXT_SUITE:-"chromeos_dev"}
 DEFAULT_DEV_SUITE=${CHROMEOS_DEV_SUITE:-"chromeos_dev"}
 DEFAULT_IMG_SUITE=${CHROMEOS_IMG_SUITE:-"chromeos"}
@@ skipping 24 matching lines @@
 # -----------------------------------------------------------------------------
 # Functions
 
 # Make a package
 function make_pkg_common {
   # Positional parameters from calling script.  :? means "fail if unset".
   set -e
   PKG_BASE=${1:?}
   shift
   set +e
-  
+
   # All packages are built in the chroot
   assert_inside_chroot
 
   # Command line options
   DEFINE_string build_root "$DEFAULT_BUILD_ROOT" "Root of build output"
 
   # Parse command line and update positional args
   FLAGS "$@" || exit 1
   eval set -- "${FLAGS_ARGV}"
 
@@ skipping 49 matching lines @@
   # Positional parameters from calling script.  :? means "fail if unset".
   PKG_NAME=${1:?}
   shift
 
   if [ -z `which $PKG_NAME` ]
   then
     echo "Can't find $PKG_NAME; attempting to install it."
     sudo apt-get --yes --force-yes install $PKG_NAME
   fi
 }