Modify "upgrade status" to "upgrade progress status"

The commands and api functions about 'get/set upgrade status' are
changed to 'upgrade progress status like below:

 * device_board_get_upgrade_status
   -> device_board_get_upgrade_progress_status

 * device_board_set_upgrade_status
   -> device_board_set_upgrade_progress_status

 * hal_device_board_get_upgrade_status
   -> hal_device_board_get_upgrade_progress_status

 * hal_device_board_set_upgrade_status
   -> hal_device_board_set_upgrade_progress_status

Thus, the corresponding scripts and source files should be modified too.

Change-Id: I6788dceb0a6bd3ea80ae124aac8f51d216b312d5
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/scripts/rw-upgrade/update-finalize.sh.in b/scripts/rw-upgrade/update-finalize.sh.in
index 172de40ed35f9dec2d108457186735a71c360572..f29497bf0ef32843d3763ee6516ebf4762ab12e8 100644 (file)
--- a/scripts/rw-upgrade/update-finalize.sh.in
+++ b/scripts/rw-upgrade/update-finalize.sh.in
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 RW_MACRO=@UPGRADE_SCRIPTS_DIR@/rw-update-macro.inc
 
-HAL_SET_UPGRADE_STATUS=/usr/bin/device_board_set_upgrade_status
+HAL_SET_UPGRADE_PROGRESS_STATUS=/usr/bin/device_board_set_upgrade_progress_status
 
 SCRIPT_NAME=$(basename $0)
 CRITICAL_LOG()
@@ -17,13 +17,13 @@ CRITICAL_LOG()
        echo "$LOG"
 }
 
-SET_UPGRADE_STATUS()
+SET_UPGRADE_PROGRESS_STATUS()
 {
-       ${HAL_SET_UPGRADE_STATUS} "$1"
+       ${HAL_SET_UPGRADE_PROGRESS_STATUS} "$1"
        if [ $? -eq 0 ]; then
-               CRITICAL_LOG "set_upgrade_status success: ${1}"
+               CRITICAL_LOG "set_upgrade_progress_status success: ${1}"
        else
-               CRITICAL_LOG "set_upgrade_status failed: ${1}"
+               CRITICAL_LOG "set_upgrade_progress_status failed: ${1}"
        fi
 }
 
@@ -43,7 +43,7 @@ if [ -z ${UPDATE_PREPARE_ERR+x} ] && [ "${UPDATE_SUCCESS}" == "1" ]; then
        COMMIT_CHANGES
        /usr/bin/device_board_clear_partition_ab_cloned
        /usr/bin/device_board_set_boot_success
-       SET_UPGRADE_STATUS 100
+       SET_UPGRADE_PROGRESS_STATUS 100
        reboot -f
 else
        reboot -f fota

diff --git a/scripts/rw-upgrade/update.sh.in b/scripts/rw-upgrade/update.sh.in
index d3ed298165c66ae8443581ab949e00088ab8e2ec..e11840e55db81f6d59e36bf40fdb1dec586d17ec 100644 (file)
--- a/scripts/rw-upgrade/update.sh.in
+++ b/scripts/rw-upgrade/update.sh.in
@@ -13,7 +13,7 @@ SHELL=/bin/bash
 UPDATE_SCRIPT_DIR=@UPGRADE_PKGSCRIPTS_DIR@
 UPDATE_DATA_DIR=/opt/data/update
 SDB_RULE=${UPDATE_DATA_DIR}/99-sdb-switch.rules
-HAL_SET_UPGRADE_STATUS=/usr/bin/device_board_set_upgrade_status
+HAL_SET_UPGRADE_PROGRESS_STATUS=/usr/bin/device_board_set_upgrade_progress_status
 HAL_PROGRESS_MIN=80
 HAL_PROGRESS_MAX=99
 
@@ -174,20 +174,20 @@ SET_UPDATE_RESULT()
        echo "$1" > ${UPDATE_RESULT_FILE}
 }
 
-SET_UPGRADE_STATUS()
+SET_UPGRADE_PROGRESS_STATUS()
 {
-       ${HAL_SET_UPGRADE_STATUS} "$1"
+       ${HAL_SET_UPGRADE_PROGRESS_STATUS} "$1"
        if [ $? -eq 0 ]; then
-               CRITICAL_LOG "set_upgrade_status success: ${1}"
+               CRITICAL_LOG "set_upgrade_progress_status success: ${1}"
        else
-               CRITICAL_LOG "set_upgrade_status failed: ${1}"
+               CRITICAL_LOG "set_upgrade_progress_status failed: ${1}"
        fi
 }
 
 if [[ $(</proc/cmdline) =~ partition_ab= ]] && [ ! -f ${RW_UPDATE_FLAG} ]
 then
        NOTIFY "${RW_UPDATE_FLAG} file does not exist. Cancel RW Upgrade."
-       SET_UPGRADE_STATUS -1
+       SET_UPGRADE_PROGRESS_STATUS -1
        exit
 fi
 
@@ -221,7 +221,7 @@ if [ ${UPDATE_PREPARE_ERR} = "1" ]
 then
        ERROR "FAIL: Update preparation was failed"
        SET_UPDATE_RESULT ${UPI_RW_UPDATE_ERROR_FAIL}
-       SET_UPGRADE_STATUS -1
+       SET_UPGRADE_PROGRESS_STATUS -1
 else
        get_version_info
        DEBUG "Version OLD: ${OLD_VER}, NEW: ${NEW_VER}"
@@ -241,7 +241,7 @@ else
                        DEBUG "[DONE] ${UPSCRIPT}"
                fi
                PROGRESS ${CURRENT_TASK}
-               SET_UPGRADE_STATUS $((HAL_PROGRESS_MIN + ((HAL_PROGRESS_MAX - HAL_PROGRESS_MIN)*CURRENT_TASK)/TOTAL_TASKS ))
+               SET_UPGRADE_PROGRESS_STATUS $((HAL_PROGRESS_MIN + ((HAL_PROGRESS_MAX - HAL_PROGRESS_MIN)*CURRENT_TASK)/TOTAL_TASKS ))
                CURRENT_TASK=$(( ${CURRENT_TASK} + 1 ))
        done
 

diff --git a/scripts/upgrade-support/upgrade-common.inc b/scripts/upgrade-support/upgrade-common.inc
index e11a0cf7788895e0d80ac104f045de4f3d6e9dd5..5cacf9729345a90922da705ae88cf170cb7c0198 100644 (file)
--- a/scripts/upgrade-support/upgrade-common.inc
+++ b/scripts/upgrade-support/upgrade-common.inc
@@ -4,7 +4,7 @@ HAL_UPGRADE_CFG_DIR="/hal/etc/upgrade/"
 HAL_PART_MAP_FILE="label_map.list"
 HAL_PART_LIST_FILE="background_copy.list"
 CONFIG_FILE="update.cfg"
-SET_UPGRADE_STATUS="/usr/bin/device_board_set_upgrade_status"
+SET_UPGRADE_PROGRESS_STATUS="/usr/bin/device_board_set_upgrade_progress_status"
 DO_RW_UPDATE_FILE="$FOTA_UPDATE_PREFIX/opt/.do_rw_update"
 TRUE=0
 FALSE=1
@@ -293,18 +293,18 @@ write_version_info() {
        echo "OLD_VER=$CVT_VER" > "$VERSION_FILE"
 }
 
-set_upgrade_status() {
+set_upgrade_progress_status() {
        VALUE="$1"
-       ${SET_UPGRADE_STATUS} ${VALUE}
+       ${SET_UPGRADE_PROGRESS_STATUS} ${VALUE}
        if [ $? -eq 0 ]; then
-               critical_log "set_upgrade_status success: ${VALUE}" "$LOG_FILE"
+               critical_log "set_upgrade_progress_status success: ${VALUE}" "$LOG_FILE"
        else
-               critical_log "set_upgrade_status failed: ${VALUE}" "$LOG_FILE"
+               critical_log "set_upgrade_progress_status failed: ${VALUE}" "$LOG_FILE"
        fi
 }
 
 exit_error() {
-       set_upgrade_status -1
+       set_upgrade_progress_status -1
        exit 1
 }
 

diff --git a/scripts/upgrade-support/upgrade-trigger.sh b/scripts/upgrade-support/upgrade-trigger.sh
index 9e10669dea9847b8e1a901b5e34c0cc30e04e462..16978446632a814bbbcee56029b9210c2f0dba2f 100644 (file)
--- a/scripts/upgrade-support/upgrade-trigger.sh
+++ b/scripts/upgrade-support/upgrade-trigger.sh
@@ -62,7 +62,7 @@ is_ab_upgrade() {
 
 do_update() {
        if is_ab_upgrade; then
-               set_upgrade_status 5
+               set_upgrade_progress_status 5
 
                if [ "$(device_board_get_partition_ab_cloned)" -eq 0 ]; then
                        unpack_file "${DOWNLOAD_DELTA}" "${SCRIPT_UPGRADE_PREPARE_PARTITIONS}"
@@ -73,7 +73,7 @@ do_update() {
                        echo "[Info] Partitions already cloned"
                fi
 
-               set_upgrade_status 20
+               set_upgrade_progress_status 20
 
                # In the next steps the content of the partitions of the second slot will
                # be modified, so they will not be a clone of the current partitions
@@ -86,16 +86,16 @@ do_update() {
                        exit_error
                fi
 
-               set_upgrade_status 40
+               set_upgrade_progress_status 40
 
                if ! "${FOTA_DIR}/${SCRIPT_UPGRADE_FOTA}"; then
                        exit_error
                fi
 
-               set_upgrade_status 80
+               set_upgrade_progress_status 80
        else
                echo "[Error] Non-A/B upgrade is unsupported"
-               device_board_set_upgrade_status -1
+               device_board_set_upgrade_progress_status -1
                exit 1
        fi
 }
@@ -107,13 +107,13 @@ verify_file() {
        VALID_CHECKSUM=$(awk "\$2 ~ /^$FILE_NAME\$/ {print \$1}" "$FOTA_DIR/checksum.SHA1")
        if [ "$VALID_CHECKSUM" == "" ]; then
                echo "[Error] No $FILE_NAME in checksum.SHA1"
-               device_board_set_upgrade_status -1
+               device_board_set_upgrade_progress_status -1
                exit 1
        fi
 
        if ! echo "$VALID_CHECKSUM  $FILE_PATH" | sha1sum --check --status; then
                echo "[Error] Checksum for file $FILE_NAME is invalid"
-               device_board_set_upgrade_status -1
+               device_board_set_upgrade_progress_status -1
                exit 1
        fi
 
@@ -149,14 +149,14 @@ RET=0
 
 if [ ${RET} -ne 0 ]; then
        log "[Error] Delta verification unsuccessful"
-       device_board_set_upgrade_status -1
+       device_board_set_upgrade_progress_status -1
        exit 1
 fi
 log "[Info] Delta verification success"
 
 . "$FOTA_DIR"/upgrade-common.inc
 
-set_upgrade_status 1
+set_upgrade_progress_status 1
 verify_img "${DOWNLOAD_DELTA}"
 do_update
 

diff --git a/src/upgrade-apply-deltafs/ua.c b/src/upgrade-apply-deltafs/ua.c
index bc48247c2f0ee88c41fec5cee6a645784f7f193f..96518047a6fe8d353934173973e9a42ff7327264 100644 (file)
--- a/src/upgrade-apply-deltafs/ua.c
+++ b/src/upgrade-apply-deltafs/ua.c
@@ -208,13 +208,13 @@ static void set_upgrade_progress(int percent)
        int relative_precent = HAL_PROGRESS_MIN + ((HAL_PROGRESS_MAX - HAL_PROGRESS_MIN) * percent)/100;
 
 #ifndef HOST_BUILD
-       if (hal_device_board_set_upgrade_status(relative_precent) < 0) {
-               LOG("set_upgrade_status failed: %d\n", relative_precent);
+       if (hal_device_board_set_upgrade_progress_status(relative_precent) < 0) {
+               LOG("set_upgrade_progress_status failed: %d\n", relative_precent);
                return;
        }
 #endif
 
-       LOG("set_upgrade_status success: %d\n", relative_precent);
+       LOG("set_upgrade_progress_status success: %d\n", relative_precent);
 }
 
 /*-----------------------------------------------------------------------------