From ec69e4be137de99d7ce585561dc4b34d9ae4a2c2 Mon Sep 17 00:00:00 2001 From: kszaq Date: Mon, 9 Feb 2015 11:20:48 +0100 Subject: [PATCH] projects/WeTek_*: Move userdata wipe to factory_update_param script This allows updating LibreELEC via recovery without wiping userdata while keeping toothpick method work when a clean flash is needed. --- projects/WeTek_Core/install/updater-script | 3 --- projects/WeTek_Play/install/updater-script | 3 --- scripts/image | 2 ++ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/WeTek_Core/install/updater-script b/projects/WeTek_Core/install/updater-script index 05cbc97287..7c133e5ab9 100644 --- a/projects/WeTek_Core/install/updater-script +++ b/projects/WeTek_Core/install/updater-script @@ -1,9 +1,6 @@ show_progress(0.500000, 3); set_bootloader_env("upgrade_step", "3"); -ui_print("Wiping Userdata"); -format("ext4", "EMMC", "/dev/block/data", "0", "/data"); - ui_print("Writing kernel image"); assert(package_extract_file("KERNEL", "/tmp/boot.img"), write_raw_image("/tmp/boot.img", "boot"), diff --git a/projects/WeTek_Play/install/updater-script b/projects/WeTek_Play/install/updater-script index 87b5bb47e9..cda32c019b 100644 --- a/projects/WeTek_Play/install/updater-script +++ b/projects/WeTek_Play/install/updater-script @@ -1,9 +1,6 @@ show_progress(0.500000, 3); set_bootloader_env("upgrade_step", "3"); -ui_print("Wiping Userdata"); -format("ext4", "EMMC", "/dev/block/data", "0", "/data"); - show_progress(0.020000, 0); ui_print("Wiping System"); diff --git a/scripts/image b/scripts/image index 31b9754345..bafa133d1c 100755 --- a/scripts/image +++ b/scripts/image @@ -407,6 +407,8 @@ fi echo "Creating Amlogic ZIP auto-install package" pushd sign > /dev/null echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml + echo --wipe_data >> factory_update_param.aml + echo --wipe_cache >> factory_update_param.aml cp $INSTALL_SRC_DIR/files/recovery.img . if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then cp $INSTALL_SRC_DIR/files/aml_autoscript .