host/cros_generate_stateful_update_payload - Issue 6542009: devserver: start using payload scripts bundled with devserver

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: host/cros_generate_stateful_update_payload

Issue 6542009: devserver: start using payload scripts bundled with devserver (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/dev-util.git@master

Patch Set: Nits Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: host/cros_generate_stateful_update_payload

diff --git a/host/cros_generate_stateful_update_payload b/host/cros_generate_stateful_update_payload

index a2c170a84e6df299d898c8a65670271d71efd868..8d54e2ec4a178cb03ecbf1683a5741915ba13410 100755

--- a/host/cros_generate_stateful_update_payload

+++ b/host/cros_generate_stateful_update_payload

@@ -27,7 +27,9 @@ def GenerateStatefulPayload(image_path, output_directory, logger):

from_dir = os.path.dirname(image_path)

image = os.path.basename(image_path)

output_gz = os.path.join(output_directory, STATEFUL_FILE)

- crosutils_dir = os.path.dirname(__file__)

+ # TODO(zbehan): This is only used for mount_gpt_image.sh. That script also

+ # needs to move away from src/scripts.

+ crosutils_dir = '%s/src/scripts' % os.environ['CROS_WORKON_SRCROOT']

# Temporary directories for this function.

rootfs_dir = tempfile.mkdtemp(suffix='rootfs', prefix='tmp')

« no previous file with comments | « buildutil.py ('k') | no next file » | no next file with comments »