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: Ifc32791c5d04c2ce44e61fd69a36cd710d2af257
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/packaging/upgrade.spec b/packaging/upgrade.spec
index 926f65222e47acd8db2a7c8d868c076d2b255d6f..92ed4878e5b564717370573342774c2df1015aef 100644 (file)
--- a/packaging/upgrade.spec
+++ b/packaging/upgrade.spec
@@ -61,11 +61,11 @@ This package provides utility needed to modify metadata of a super partition by
 changing size of dynamic partitions.
 
 %package -n copy-blockdev
-Summary:  Utility which copies block devices and updates upgrade status
+Summary:  Utility which copies block devices and updates upgrade progress status
 
 %description -n copy-blockdev
 This package provides utility which copies block device to another and updates
-upgrade status.
+upgrade progress status.
 
 %prep
 %setup -q

diff --git a/scripts/rw-upgrade/offline-update-finalize.sh.in b/scripts/rw-upgrade/offline-update-finalize.sh.in
index 7b9e16e99f6cda220753f013724e7bf2fa1c1866..c730fd92ec1e9052833e3014e803705a34cf50cb 100644 (file)
--- a/scripts/rw-upgrade/offline-update-finalize.sh.in
+++ b/scripts/rw-upgrade/offline-update-finalize.sh.in
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 RW_MACRO=@UPGRADE_SCRIPTS_DIR@/rw-update-macro.inc
 UPDATE_VERIFY_SCRIPT=@UPGRADE_SCRIPTS_DIR@/update-verify.sh
-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
 }
 
@@ -44,7 +44,7 @@ if [ -z ${UPDATE_PREPARE_ERR+x} ] && "$UPDATE_VERIFY_SCRIPT"; then
 
        /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/online-update-failure.service b/scripts/rw-upgrade/online-update-failure.service
index 62bb9aa991cc86a339a4e4501f4d8fefa492170b..1f43b2431cbddae6971d0e69d7d85c36178e8da2 100644 (file)
--- a/scripts/rw-upgrade/online-update-failure.service
+++ b/scripts/rw-upgrade/online-update-failure.service
@@ -7,7 +7,7 @@ ConditionKernelCommandLine=bootmode=fota
 [Service]
 Type=oneshot
 SmackProcessLabel=System::Privileged
-ExecStartPre=-/bin/device_board_set_upgrade_status -1
+ExecStartPre=-/bin/device_board_set_upgrade_progress_status -1
 ExecStart=/usr/sbin/reboot -f fota
 StandardOutput=tty
 StandardError=tty

diff --git a/scripts/rw-upgrade/online-update-success.sh.in b/scripts/rw-upgrade/online-update-success.sh.in
index 24e293882fc3ff83d4d8c08e91dcb530586e45b4..0a67d3167a74f62bfa61e539cb4967590c964586 100644 (file)
--- a/scripts/rw-upgrade/online-update-success.sh.in
+++ b/scripts/rw-upgrade/online-update-success.sh.in
@@ -2,7 +2,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()
@@ -15,13 +15,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
 }
 
@@ -42,7 +42,7 @@ if [ -z ${UPDATE_PREPARE_ERR+x} ]; then
 
        /usr/bin/device_board_clear_partition_ab_cloned
        /usr/bin/device_board_set_boot_success
-       SET_UPGRADE_STATUS 100
+       SET_UPGRADE_PROGRESS_STATUS 100
 else
        reboot -f fota
 fi

diff --git a/scripts/rw-upgrade/update.sh.in b/scripts/rw-upgrade/update.sh.in
index d6f4734a0213eb327eefa7c6f4d289910c951fe1..f9dba2d084af8ae20bcc32c87873d2159e00ff9f 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
 
@@ -83,20 +83,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
 
@@ -125,7 +125,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}"
@@ -146,7 +146,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 5bf1ea869e410884aa9548a2207bee128961ce2c..f9867ebfae654b0180ce59c535c9fda29d623460 100644 (file)
--- a/scripts/upgrade-support/upgrade-common.inc
+++ b/scripts/upgrade-support/upgrade-common.inc
@@ -4,8 +4,8 @@ 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"
-GET_UPGRADE_STATUS="/usr/bin/device_board_get_upgrade_status"
+SET_UPGRADE_PROGRESS_STATUS="/usr/bin/device_board_set_upgrade_progress_status"
+GET_UPGRADE_PROGRESS_STATUS="/usr/bin/device_board_get_upgrade_progress_status"
 DO_RW_UPDATE_FILE="$FOTA_UPDATE_PREFIX/opt/.do_rw_update"
 TRUE=0
 FALSE=1
@@ -317,8 +317,8 @@ background_copy() {
        local update=""
 
        if [ "$#" -eq 1 ]; then
-               if ! curr_progress_from="$($GET_UPGRADE_STATUS)"; then
-                       log "[Error] Cannot check upgrade status value"
+               if ! curr_progress_from="$($GET_UPGRADE_PROGRESS_STATUS)"; then
+                       log "[Error] Cannot check upgrade progress status value"
                        exit_error
                fi
                progress_to=$1
@@ -579,18 +579,18 @@ write_version_info() {
        echo "OLD_VER=$CVT_VER" > "$VERSION_FILE"
 }
 
-set_upgrade_status() {
+set_upgrade_progress_status() {
        VALUE="$1"
-       ${SET_UPGRADE_STATUS} "${VALUE}" &>/dev/null
+       ${SET_UPGRADE_PROGRESS_STATUS} "${VALUE}" &>/dev/null
        if [ $? -eq 0 ]; then
-               critical_log "[Info] set_upgrade_status success: status is ${VALUE}"
+               critical_log "[Info] set_upgrade_progress_status success: status is ${VALUE}"
        else
-               critical_log "[Info] set_upgrade_status failed: status is ${VALUE}"
+               critical_log "[Info] set_upgrade_progress_status failed: status is ${VALUE}"
        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 d29876f4717f5d67cd50efd66d0536aaa6f86f95..7c24580d87ac62f6cf9298545b366fbf8cde9c3b 100644 (file)
--- a/scripts/upgrade-support/upgrade-trigger.sh
+++ b/scripts/upgrade-support/upgrade-trigger.sh
@@ -96,7 +96,7 @@ run_script() {
 
 do_update() {
        if is_ab_upgrade; then
-               set_upgrade_status 5
+               set_upgrade_progress_status 5
 
                unpack_file "${DELTA_A}" "${BLKID_PRINT_FILE}" "${DELTA_A_CHECKSUM_FILE}" ""
                chmod +x "$FOTA_DIR/$BLKID_PRINT_FILE"
@@ -126,7 +126,7 @@ do_update() {
                        fi
                else
                        log "[Info] Partitions already cloned"
-                       set_upgrade_status $PROGRESS_AFTER_CLONING
+                       set_upgrade_progress_status $PROGRESS_AFTER_CLONING
                fi
 
                # In the next steps the content of the partitions of the second slot will
@@ -141,7 +141,7 @@ do_update() {
                        exit_error
                fi
 
-               set_upgrade_status $PROGRESS_AFTER_RO
+               set_upgrade_progress_status $PROGRESS_AFTER_RO
 
                # During the execution of ${SCRIPT_UPGRADE_FOTA} system will reboot, so the
                # script will be aborted. We don't want this to be treated as an error.
@@ -149,14 +149,14 @@ do_update() {
                set -u errexit
        else
                log "[Error] Non-A/B upgrade is unsupported"
-               device_board_set_upgrade_status -1
+               device_board_set_upgrade_progress_status -1
                exit 1
        fi
 }
 
 do_finish() {
-       current_upgrade_status=$(device_board_get_upgrade_status)
-       if [ "$current_upgrade_status" != "$PROGRESS_AFTER_RO" ]; then
+       current_upgrade_progress_status=$(device_board_get_upgrade_progress_status)
+       if [ "$current_upgrade_progress_status" != "$PROGRESS_AFTER_RO" ]; then
                critical_log "[Error] Cannot finish upgrade - RO Upgrade has not been completed"
                exit $ERR_FINISH_BEFORE_RO_UPDATE_COMPLETE
        fi
@@ -171,7 +171,7 @@ do_finish() {
                        # No, it's not a reboot. Rather it is a regular error.
                        exit_error
                else
-                       set_upgrade_status $PROGRESS_AFTER_RO
+                       set_upgrade_progress_status $PROGRESS_AFTER_RO
                        log "[Info] RO update: $SCRIPT_NAME success"
                fi
        fi
@@ -185,13 +185,13 @@ verify_file() {
        VALID_CHECKSUM=$(awk "\$2 ~ /^$FILE_NAME\$/ {print \$1}" "$CHECKSUM_FILE")
        if [ "$VALID_CHECKSUM" == "" ]; then
                log "[Error] No $FILE_NAME in $CHECKSUM_FILE"
-               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
                log "[Error] Checksum for file $FILE_NAME is invalid [$CHECKSUM_FILE]"
-               device_board_set_upgrade_status -1
+               device_board_set_upgrade_progress_status -1
                exit 1
        fi
 
@@ -286,7 +286,7 @@ fi
 
 if [ ! -f "$FOTA_DIR/upgrade-common.inc" ]; then
        echo "[Error] upgrade-common.inc does not exist"
-       device_board_set_upgrade_status -1
+       device_board_set_upgrade_progress_status -1
        exit 1
 fi
 
@@ -320,12 +320,12 @@ if [ $MODE_RO_UPDATE = true ]; then
 
        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"
 
-       set_upgrade_status 1
+       set_upgrade_progress_status 1
 
        verify_img "$DELTA_A"
        if [ $SINGLE_DELTA = false ]; then

diff --git a/src/copy-blockdev/lib.c b/src/copy-blockdev/lib.c
index f8c2ec1084b502d90f2be7096284103e5ca0b40e..4411104a2c6a7248d979f605b855f4cec12db3de 100644 (file)
--- a/src/copy-blockdev/lib.c
+++ b/src/copy-blockdev/lib.c
@@ -64,7 +64,7 @@ void usage(char *name) {
                     "  %d\tError during SHA1 checksum calculation of src\n"
                     "  %d\tError during SHA1 checksum calculation of dst\n"
                     "  %d\tSHA1 checksum of src and dst after copying do not match\n"
-                    "  %d\tSHA1 Cannot set upgrade status\n",
+                    "  %d\tSHA1 Cannot set upgrade progress status\n",
                     name, name, EXIT_SUCCESS, ERR_WRONG_ARGC, ERR_SAME_FILE,
                     ERR_WRONG_CNT, ERR_WRONG_START, ERR_WRONG_STOP, ERR_WRONG_PARTSIZE,
                     ERR_WRONG_ARG, ERR_SRC_OPEN, ERR_DST_OPEN, ERR_SENDFILE, ERR_CHECK_SIZE,
@@ -290,8 +290,8 @@ int copy_and_update_progress(struct params_t *params) {
 
         if (progress - prev_progress > 0) {
             #ifndef HOST_BUILD
-                if (params->update && hal_device_board_set_upgrade_status(progress) < 0) {
-                    fprintf(stderr, "Cannot set upgrade status.\n");
+                if (params->update && hal_device_board_set_upgrade_progress_status(progress) < 0) {
+                    fprintf(stderr, "Cannot set upgrade progress status.\n");
                     return ERR_STATUS;
                 };
             #endif
@@ -302,8 +302,8 @@ int copy_and_update_progress(struct params_t *params) {
     }
 
     #ifndef HOST_BUILD
-        if (params->update && hal_device_board_set_upgrade_status(params->progress_to) < 0) {
-            fprintf(stderr, "Cannot set upgrade status.\n");
+        if (params->update && hal_device_board_set_upgrade_progress_status(params->progress_to) < 0) {
+            fprintf(stderr, "Cannot set upgrade progress status.\n");
             return ERR_STATUS;
         }
     #endif

diff --git a/src/upgrade-apply-deltafs/ua.c b/src/upgrade-apply-deltafs/ua.c
index aa7f0ef0d5308a2b0b85b1a2ace84522fad536f6..ecd21c0637c35d228f6c0f6dd55187ca5e58e609 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);
 }
 
 /*-----------------------------------------------------------------------------