From aabded5941e44deac77f2581306f198a540ab1c6 Mon Sep 17 00:00:00 2001 From: Zdenek Behan Date: Wed, 9 Feb 2011 01:16:04 +0100 Subject: [PATCH] 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 --- make_factory_package.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/make_factory_package.sh b/make_factory_package.sh index bc68119e3c..04366d79b1 100755 --- a/make_factory_package.sh +++ b/make_factory_package.sh @@ -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