Revert "Apply upgrade path config: TZ_SYS_UPGRADE"

This reverts commit 9633446018c18469d167a1cabbf5cfa601140010.

Change-Id: I41bde7ffc24ef34db829c29fd768efbc9b41f361

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c69c278e542bb43a5ed3a867f0a74df2e357a02..4387de8af26e82106afb45b2bcc1134ccff24c73 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,4 @@ IF("${FOTA_GUI_TYPE}" STREQUAL "GUI_TW")
        ADD_SUBDIRECTORY(fota_gui)
 ENDIF("${FOTA_GUI_TYPE}" STREQUAL "GUI_TW")
 
-CONFIGURE_FILE(scripts/upgrade-trigger.sh.in scripts/upgrade-trigger.sh @ONLY)
-
 ADD_SUBDIRECTORY(update-helper)

diff --git a/packaging/tota-ua.spec b/packaging/tota-ua.spec
index 6f279e8fbf0d38c80b3f2790a65a36c6bda4d51a..424f131ac732c0590c01d0cfab9d435ed2e6fdbc 100755 (executable)
--- a/packaging/tota-ua.spec
+++ b/packaging/tota-ua.spec
@@ -1,7 +1,7 @@
 Name:          tota-ua
 Summary:       fota update agent
 ExclusiveArch:         %{arm}
-Version:       1.2.5
+Version:       1.2.6
 Release:       0
 Group:         System
 License:       Apache-2.0
@@ -49,8 +49,6 @@ LDFLAGS="$LDFLAGS"
 %cmake \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DFOTA_GUI_TYPE="GUI_TW" \
-       -DTZ_SYS_UPGRADE=%TZ_SYS_UPGRADE \
-       -DTZ_SYS_UPGRADE_DATA=%TZ_SYS_UPGRADE_DATA \
        -DSYSTEM_BUS_SERVICES_DIR=%{system_bus_services_dir} \
        -DSYSTEMD_DBUS_CONF_DIR=%{systemd_dbus_conf_dir}
 
@@ -64,9 +62,11 @@ cp scripts/wearable/41-tota-ua.list \
           %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.wearable
 
 install -m 755 scripts/upgrade-trigger.sh %{buildroot}%{_bindir}
+%define fota_dir /opt/usr/data/fota
+mkdir -p %{buildroot}%{fota_dir}
 
 # update-helper-service
-%define update_dir %TZ_SYS_UPGRADE
+%define update_dir %{_datadir}/upgrade
 mkdir -p %{buildroot}%{update_dir}
 mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 install -m 755 update-helper/update-helper.sh %{buildroot}%{update_dir}
@@ -83,6 +83,7 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.wearable \
 %license LICENSE
 %manifest tota-ua.manifest
 %doc README
+%{fota_dir}
 %defattr(-,root,root,-)
 %{_bindir}/delta.ua
 %{_bindir}/upgrade-trigger.sh

diff --git a/scripts/upgrade-trigger.sh b/scripts/upgrade-trigger.sh
new file mode 100644 (file)
index 0000000..0d14ac9
--- /dev/null
+++ b/scripts/upgrade-trigger.sh
@@ -0,0 +1,142 @@
+#!/bin/bash
+FOTA_DIR="/opt/usr/data/fota"
+STATUS_DIR="/opt/data/update"
+VERSION_FILE="/opt/etc/version"
+DOWNLOAD_DELTA=$1
+DELTA_TAR="$FOTA_DIR/delta.tar"
+UPG_VERIFIER="/usr/sbin/upg-verifier"
+
+flash_pre_image() {
+       echo "Flash images for update..."
+       DEVICE="/dev/mmcblk0"
+       CONFIG_FILE="update.cfg"
+
+       /bin/tar xvfp $DELTA_TAR -C "$FOTA_DIR" $CONFIG_FILE
+       if [ ! -e "$FOTA_DIR/$CONFIG_FILE" ]; then
+               echo "There is no $CONFIG_FILE"
+               return
+       fi
+
+       while read PART_NAME DELTA_NAME TYPE DEV OFFSET SIZE HASH1 HASH2
+       do
+               if [ "$TYPE" = "PRE_UA" ]; then
+                       /bin/tar xvfp $DELTA_TAR -C $FOTA_DIR $DELTA_NAME
+                       if [ ! -e "$FOTA_DIR/$DELTA_NAME" ]; then
+                               echo "There is no delta for $PART_NAME"
+                               continue
+                       fi
+
+                       EMMC_DEVICE="/dev/mmcblk0"
+                       PART_NAME_L=$(echo $PART_NAME | /bin/tr '[:upper:]' '[:lower:]')
+                       DEV_NUM=$(/sbin/partx -s $EMMC_DEVICE | grep $PART_NAME_L | \
+                                       { read NUM REST; echo $NUM; })
+                       if [ -z "$DEV_NUM" ]; then
+                               DEV_NUM=$(/sbin/blkid -L $PART_NAME_L -o device | grep $EMMC_DEVICE | \
+                                               sed 's/\/dev\/mmcblk0p//')
+                       fi
+                       if [ -z "$DEV_NUM" ]; then
+                               DEV=${DEV}
+                       else
+                               DEV="${EMMC_DEVICE}p${DEV_NUM}"
+                       fi
+
+                       echo "Flashing $DELTA_NAME..."
+                       dd if="$FOTA_DIR/$DELTA_NAME" of="$DEV" bs=1024
+                       rm -f $FOTA_DIR/$DELTA_NAME
+
+                       # Remove updated partition from cfg
+                       /bin/cat "$FOTA_DIR/$CONFIG_FILE" | /bin/sed /^$PART_NAME/d \
+                               > "$FOTA_DIR/${CONFIG_FILE}_tmp"
+                       /bin/mv "$FOTA_DIR/${CONFIG_FILE}_tmp" "$FOTA_DIR/$CONFIG_FILE"
+
+                       /bin/tar --delete --file=$DELTA_TAR $CONFIG_FILE
+                       /bin/tar rvf $DELTA_TAR -C $FOTA_DIR $CONFIG_FILE
+               fi
+       done < "$FOTA_DIR/$CONFIG_FILE"
+}
+
+write_version_info() {
+       OLD_VER=$(cat /etc/config/model-config.xml | grep platform.version\" \
+                       | sed -e 's/.*>\(.*\)<.*/\1/' | head -1)
+       i=0
+       VER=(0 0 0 0)
+       for ENT in $(echo "$OLD_VER" | tr "." "\n"); do
+               VER[$i]=$ENT
+               ((i++))
+       done
+       CVT_VER=${VER[0]}.${VER[1]}.${VER[2]}.${VER[3]}
+
+       echo "OLD_VER=$CVT_VER" > $VERSION_FILE
+}
+
+run_pre_script() {
+       PRE_SCRIPT_NAME=pre.sh
+       PRE_SCRIPT_PATH=$FOTA_DIR/$PRE_SCRIPT_NAME
+
+       /bin/tar xvfp $DELTA_TAR -C $FOTA_DIR $PRE_SCRIPT_NAME
+
+       if [ -e $PRE_SCRIPT_PATH ]; then
+               /bin/sh $PRE_SCRIPT_PATH
+               rm $PRE_SCRIPT_PATH
+       fi
+}
+
+# Check fota directory
+if [ ! -d "$FOTA_DIR" ]; then
+       echo "Create fota dir..."
+       /bin/mkdir -p "$FOTA_DIR"
+fi
+
+if [ ! -d "$STATUS_DIR" ]; then
+       echo "Create status dir..."
+       /bin/mkdir -p "$STATUS_DIR"
+fi
+
+# Record version info in target if it doesn't exist
+ls "$VERSION_FILE"
+if [ $? -ne 0 ]; then
+       write_version_info
+fi
+
+echo "Copy delta.tar..."
+/bin/cp $DOWNLOAD_DELTA $DELTA_TAR
+sync
+
+# Verify delta.tar
+if [ -e "$UPG_VERIFIER" ]; then
+       echo "Package verifier is found. Verify $DELTA_TAR"
+       $UPG_VERIFIER $DELTA_TAR
+       if [ $? -ne 0 ]; then
+               echo "Update package verification FAILED..."
+               echo 5 > "$STATUS_DIR"/result
+               exit 1
+       else
+               echo "Update package verification PASSED!"
+       fi
+fi
+
+# Run pre-script if exist
+run_pre_script
+
+# Flash images
+#  - in case of some new image was included
+#  - in case of some image should be flashed before update
+flash_pre_image
+
+# Extract delta.ua
+echo "Extract delta.ua..."
+/bin/tar xvfp $DELTA_TAR -C "$FOTA_DIR" delta.ua
+sync
+sleep 1
+
+# FOTA: /usr/bin/rw-update-prepare.sh
+
+# Write delta saved path
+echo "Write paths..."
+echo "$FOTA_DIR" > "$STATUS_DIR/DELTA.PATH"
+echo "$(dirname $DOWNLOAD_DELTA)" > "$STATUS_DIR/DOWNLOAD.PATH"
+sync
+
+# go to fota mode
+echo "Go TOTA update..."
+/sbin/reboot fota

diff --git a/scripts/upgrade-trigger.sh.in b/scripts/upgrade-trigger.sh.in
deleted file mode 100644 (file)
index 1beeaa9..0000000
--- a/scripts/upgrade-trigger.sh.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-STATUS_DIR="@TZ_SYS_UPGRADE_DATA@"
-FOTA_DIR="$STATUS_DIR/fota"
-VERSION_FILE="/opt/etc/version"
-DOWNLOAD_DELTA=$1
-DELTA_TAR="$FOTA_DIR/delta.tar"
-UPG_VERIFIER="/usr/sbin/upg-verifier"
-
-flash_pre_image() {
-       echo "Flash images for update..."
-       DEVICE="/dev/mmcblk0"
-       CONFIG_FILE="update.cfg"
-
-       /bin/tar xvfp $DELTA_TAR -C "$FOTA_DIR" $CONFIG_FILE
-       if [ ! -e "$FOTA_DIR/$CONFIG_FILE" ]; then
-               echo "There is no $CONFIG_FILE"
-               return
-       fi
-
-       while read PART_NAME DELTA_NAME TYPE DEV OFFSET SIZE HASH1 HASH2
-       do
-               if [ "$TYPE" = "PRE_UA" ]; then
-                       /bin/tar xvfp $DELTA_TAR -C $FOTA_DIR $DELTA_NAME
-                       if [ ! -e "$FOTA_DIR/$DELTA_NAME" ]; then
-                               echo "There is no delta for $PART_NAME"
-                               continue
-                       fi
-
-                       EMMC_DEVICE="/dev/mmcblk0"
-                       PART_NAME_L=$(echo $PART_NAME | /bin/tr '[:upper:]' '[:lower:]')
-                       DEV_NUM=$(/sbin/partx -s $EMMC_DEVICE | grep $PART_NAME_L | \
-                                       { read NUM REST; echo $NUM; })
-                       if [ -z "$DEV_NUM" ]; then
-                               DEV_NUM=$(/sbin/blkid -L $PART_NAME_L -o device | grep $EMMC_DEVICE | \
-                                               sed 's/\/dev\/mmcblk0p//')
-                       fi
-                       if [ -z "$DEV_NUM" ]; then
-                               DEV=${DEV}
-                       else
-                               DEV="${EMMC_DEVICE}p${DEV_NUM}"
-                       fi
-
-                       echo "Flashing $DELTA_NAME..."
-                       dd if="$FOTA_DIR/$DELTA_NAME" of="$DEV" bs=1024
-                       rm -f $FOTA_DIR/$DELTA_NAME
-
-                       # Remove updated partition from cfg
-                       /bin/cat "$FOTA_DIR/$CONFIG_FILE" | /bin/sed /^$PART_NAME/d \
-                               > "$FOTA_DIR/${CONFIG_FILE}_tmp"
-                       /bin/mv "$FOTA_DIR/${CONFIG_FILE}_tmp" "$FOTA_DIR/$CONFIG_FILE"
-
-                       /bin/tar --delete --file=$DELTA_TAR $CONFIG_FILE
-                       /bin/tar rvf $DELTA_TAR -C $FOTA_DIR $CONFIG_FILE
-               fi
-       done < "$FOTA_DIR/$CONFIG_FILE"
-}
-
-write_version_info() {
-       OLD_VER=$(cat /etc/config/model-config.xml | grep platform.version\" \
-                       | sed -e 's/.*>\(.*\)<.*/\1/' | head -1)
-       i=0
-       VER=(0 0 0 0)
-       for ENT in $(echo "$OLD_VER" | tr "." "\n"); do
-               VER[$i]=$ENT
-               ((i++))
-       done
-       CVT_VER=${VER[0]}.${VER[1]}.${VER[2]}.${VER[3]}
-
-       echo "OLD_VER=$CVT_VER" > $VERSION_FILE
-}
-
-run_pre_script() {
-       PRE_SCRIPT_NAME=pre.sh
-       PRE_SCRIPT_PATH=$FOTA_DIR/$PRE_SCRIPT_NAME
-
-       /bin/tar xvfp $DELTA_TAR -C $FOTA_DIR $PRE_SCRIPT_NAME
-
-       if [ -e $PRE_SCRIPT_PATH ]; then
-               /bin/sh $PRE_SCRIPT_PATH
-               rm $PRE_SCRIPT_PATH
-       fi
-}
-
-# Check fota directory
-if [ ! -d "$FOTA_DIR" ]; then
-       echo "Create fota dir..."
-       /bin/mkdir -p "$FOTA_DIR"
-fi
-
-if [ ! -d "$STATUS_DIR" ]; then
-       echo "Create status dir..."
-       /bin/mkdir -p "$STATUS_DIR"
-fi
-
-# Record version info in target if it doesn't exist
-ls "$VERSION_FILE"
-if [ $? -ne 0 ]; then
-       write_version_info
-fi
-
-echo "Copy delta.tar..."
-/bin/cp $DOWNLOAD_DELTA $DELTA_TAR
-sync
-
-# Verify delta.tar
-if [ -e "$UPG_VERIFIER" ]; then
-       echo "Package verifier is found. Verify $DELTA_TAR"
-       $UPG_VERIFIER $DELTA_TAR
-       if [ $? -ne 0 ]; then
-               echo "Update package verification FAILED..."
-               echo 5 > "$STATUS_DIR"/result
-               exit 1
-       else
-               echo "Update package verification PASSED!"
-       fi
-fi
-
-# Run pre-script if exist
-run_pre_script
-
-# Flash images
-#  - in case of some new image was included
-#  - in case of some image should be flashed before update
-flash_pre_image
-
-# Extract delta.ua
-echo "Extract delta.ua..."
-/bin/tar xvfp $DELTA_TAR -C "$FOTA_DIR" delta.ua
-sync
-sleep 1
-
-# FOTA: /usr/bin/rw-update-prepare.sh
-
-# Write delta saved path
-echo "Write paths..."
-echo "$FOTA_DIR" > "$STATUS_DIR/DELTA.PATH"
-echo "$(dirname $DOWNLOAD_DELTA)" > "$STATUS_DIR/DOWNLOAD.PATH"
-sync
-
-# go to fota mode
-echo "Go TOTA update..."
-/sbin/reboot fota

diff --git a/src/ua.c b/src/ua.c
index 8b55dcb7d566ab2f6dbd566dfe0db52e6a6f4751..b83344d44fe8681417d1ad91b6c02b148ff9a8f0 100755 (executable)
--- a/src/ua.c
+++ b/src/ua.c
@@ -41,7 +41,7 @@
 
 #define MAX_CFG_LEN    4096
 
-#define FOTA_PATH              SS_COMMON_FOTA_PATH
+#define RAMDISK_PATH           "/opt/usr/data/fota"
 #define FOTA_GUI_INTERFACE     "/usr/bin/fota_gui_test"
 #define SYSTEM_LOG_DIR         "/opt/var/log"
 
@@ -426,7 +426,7 @@ int update_RecoveryDelta_IMG(int part_idx, int update_type)
        ua_dataSS.ua_operation = UI_OP_SCOUT_UPDATE;
        ua_dataSS.ui_progress = fota_gui_progress;
        if (ua_update_data->ua_delta_path != NULL && ua_dataSS.update_data->ua_temp_path) {
-               snprintf(ua_dataSS.update_data->ua_temp_path, MAX_FILE_PATH, "%s/%s", FOTA_PATH, ua_dataSS.parti_info->ua_parti_name);
+               snprintf(ua_dataSS.update_data->ua_temp_path, MAX_FILE_PATH, "%s/%s", RAMDISK_PATH, ua_dataSS.parti_info->ua_parti_name);
                LOG("update_RecoveryDelta_IMG() [%s] temp path [%s]\n", ua_dataSS.parti_info->ua_parti_name, ua_dataSS.update_data->ua_temp_path);
                ret = SS_IMGUpdatemain(&ua_dataSS, update_type);        //PASS temp path whr file has to be written, Once written it should be UNLINKED after upgrade.
                }