Revert "cros_generate_update_payload: kill old style update image generation"

This reverts commit fad7fecc4d.

BUG=n0ne
TEST=

Review URL: http://codereview.chromium.org/6246073

Change-Id: I7652b57145931b9d6ed85d82f648eb6f5dc35ae2
This commit is contained in:
Zdenek Behan 2011-02-04 23:44:15 +01:00
parent d569a90bbd
commit ca9b334e8e

View File

@ -247,11 +247,6 @@ if [ "$DELTA" -eq "$FLAGS_TRUE" -o "$FLAGS_old_style" -eq "$FLAGS_FALSE" ]; then
else else
echo "Generating old-style full update" 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 trap cleanup INT TERM EXIT
DST_KERNEL=$(extract_partition_to_temp_file "$FLAGS_image" 2) DST_KERNEL=$(extract_partition_to_temp_file "$FLAGS_image" 2)
if [ "$FLAGS_patch_kernel" -eq "$FLAGS_TRUE" ]; then if [ "$FLAGS_patch_kernel" -eq "$FLAGS_TRUE" ]; then
@ -259,7 +254,7 @@ else
fi fi
DST_ROOT=$(extract_partition_to_temp_file "$FLAGS_image" 3) 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" CROS_GENERATE_UPDATE_PAYLOAD_CALLED=1 "$GENERATOR" "$DST_KERNEL" "$DST_ROOT"
mv "$(dirname "$DST_KERNEL")/update.gz" "$FLAGS_output" mv "$(dirname "$DST_KERNEL")/update.gz" "$FLAGS_output"