Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: cros_generate_update_payload

Issue 6349060: cros_generate_update_payload: kill old style update image generation (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: Created 9 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cros_generate_update_payload
diff --git a/cros_generate_update_payload b/cros_generate_update_payload
index b55f438526109e2db548938d8d5b588a5ede0ec9..586b2f8f2396640e54f93e7755e3407b848c38ab 100755
--- a/cros_generate_update_payload
+++ b/cros_generate_update_payload
@@ -247,6 +247,11 @@ 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
@@ -254,7 +259,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"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698