make_factory_package: allow calling from outside the chroot

As documented by the developer workflow, this script need to be
called from outside the chroot. This adds a temporary reference to
the new location of chromeos-common.sh, unbreaking the factory
workflow, and giving us time to come up with a better solution.

TEST=run inside the chroot and outside the chroot
BUG=chromium-os:11769

Change-Id: Icb90211111629ed037bc40682a94200d949050e0

Review URL: http://codereview.chromium.org/6462007
This commit is contained in:
Zdenek Behan 2011-02-09 01:16:04 +01:00
parent ac65e1e20a
commit aabded5941

View File

@ -32,11 +32,10 @@ find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
# --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh
assert_inside_chroot
# Load functions and constants for chromeos-install
. "/usr/lib/installer/chromeos-common.sh" || \
# NOTE: This script needs to be called from outside the chroot.
. "/usr/lib/installer/chromeos-common.sh" &> /dev/null || \
. "${SRC_ROOT}/platform/installer/chromeos-common.sh" || \
die "Unable to load /usr/lib/installer/chromeos-common.sh"
# Load functions designed for image processing