Issue 6246073: Revert "cros_generate_update_payload: kill old style update image generation"

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

Issue 6246073: Revert "cros_generate_update_payload: kill old style update image generation" (Closed)

Created:
9 years, 10 months ago by zbehan

Modified:
9 years, 7 months ago

Reviewers:
Sam Leffler, Nick Sanders, petkov, adlr, anush

CC:
chromium-os-reviews_chromium.org, Mandeep Singh Baines, anush, sosa

Base URL:
ssh://git@gitrw.chromium.org:9222/crosutils.git@master

Visibility:
Public.

Description

Revert "cros_generate_update_payload: kill old style update image generation" This reverts commit fad7fecc4d7a9f39efd88110ddcae85e7242830a. BUG=n0ne TEST= Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=ca9b334

Patch Set 1 #

Created: 9 years, 10 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -6 lines)			Patch
	M	cros_generate_update_payload	View		2 chunks	+1 line, -6 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

adlr

9 years, 10 months ago (2011-02-03 20:41:24 UTC) #2

LGTM

On Thu, Feb 3, 2011 at 9:20 AM, <zbehan@chromium.org> wrote:

> Reviewers: adlr, Nick Sanders, anush, Sam Leffler, petkov,
>
> Description:
> Revert "cros_generate_update_payload: kill old style update image
> generation"
>
> This reverts commit fad7fecc4d7a9f39efd88110ddcae85e7242830a.
>
> BUG=n0ne
> TEST=
>
> Please review this at http://codereview.chromium.org/6246073/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
>
> Affected files:
>  M cros_generate_update_payload
>
>
> Index: cros_generate_update_payload
> diff --git a/cros_generate_update_payload b/cros_generate_update_payload
> index
>
586b2f8f2396640e54f93e7755e3407b848c38ab..b55f438526109e2db548938d8d5b588a5ede0ec9
> 100755
> --- a/cros_generate_update_payload
> +++ b/cros_generate_update_payload
> @@ -247,11 +247,6 @@ if [ "$DELTA" -eq "$FLAGS_TRUE" -o "$FLAGS_old_style"
> -eq "$FLAGS_FALSE" ]; then
>  else
>   echo "Generating old-style full update"
>
> -  # TODO(zbehan): Remove this branch entirely and disable the cmdline
> option.
> -  echo "This is a deprecated and unused behaviour. It also introduces
> unwanted"
> -  echo "dependency to a third script (mk_memento_images) which has become
> broken."
> -  exit 1
> -
>   trap cleanup INT TERM EXIT
>   DST_KERNEL=$(extract_partition_to_temp_file "$FLAGS_image" 2)
>   if [ "$FLAGS_patch_kernel" -eq "$FLAGS_TRUE" ]; then
> @@ -259,7 +254,7 @@ else
>   fi
>   DST_ROOT=$(extract_partition_to_temp_file "$FLAGS_image" 3)
>
> -#  GENERATOR="${SCRIPTS_DIR}/mk_memento_images.sh"
> +  GENERATOR="${SCRIPTS_DIR}/mk_memento_images.sh"
>
>   CROS_GENERATE_UPDATE_PAYLOAD_CALLED=1 "$GENERATOR" "$DST_KERNEL"
> "$DST_ROOT"
>   mv "$(dirname "$DST_KERNEL")/update.gz" "$FLAGS_output"
>
>
>

Expand Messages | Collapse Messages