Remove support for non-A/B upgrade

Change-Id: I67bb1f3a27aea2af495bb584d8044035fbc73bb9

diff --git a/packaging/upgrade.spec b/packaging/upgrade.spec
index 2c87283..a5cf45f 100644 (file)
--- a/packaging/upgrade.spec
+++ b/packaging/upgrade.spec
@@ -3,7 +3,7 @@
 
 Name:          upgrade
 Summary:       Upgrade support for Tizen
-Version:       7.5.2
+Version:       7.5.3
 Release:       0
 Group:         System
 License:       Apache-2.0
@@ -134,7 +134,6 @@ fi
 %{upgrade_support_dir}/upgrade-partial.sh
 %{upgrade_support_dir}/upgrade-prepare-partitions.sh
 %{upgrade_support_dir}/upgrade-fota.sh
-%{upgrade_support_dir}/upgrade-legacy.sh
 %{upgrade_support_dir}/upgrade-common.inc
 %{_bindir}/upgrade-apply
 %{_bindir}/verity_handler

diff --git a/scripts/rw-upgrade/rw-update-macro.inc b/scripts/rw-upgrade/rw-update-macro.inc
index 5ed8aea..c431da1 100644 (file)
--- a/scripts/rw-upgrade/rw-update-macro.inc
+++ b/scripts/rw-upgrade/rw-update-macro.inc
@@ -232,8 +232,4 @@ COMMIT_CHANGES()
 {
        COMMIT_PARTITION system-data
        COMMIT_PARTITION user
-       if [[ ! $(</proc/cmdline) =~ partition_ab= ]]; then
-               # Support legacy (non-A/B) case
-               COMMIT_PARTITION hal
-       fi
 }

diff --git a/scripts/upgrade-support/upgrade-legacy.sh b/scripts/upgrade-support/upgrade-legacy.sh
deleted file mode 100644 (file)
index be16f1f..0000000
--- a/scripts/upgrade-support/upgrade-legacy.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-# This script handles non-A/B upgrade, with flashing RO & RW after reboot in 'bootmode=fota'
-set -o errexit
-trap 'echo "Aborting due to errexit on ${0##*/}:$LINENO. Exit code: $?" >&2' ERR
-set -o errtrace -e -o pipefail
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-FOTA_DIR="/opt/usr/data/fota"
-STATUS_DIR="/opt/data/update"
-DOWNLOAD_DELTA=$1
-
-. "$FOTA_DIR"/upgrade-common.inc
-
-SCRIPT_NAME="upgrade-trigger.sh"
-LOG_FILE="/tmp/upgrade-trigger.log"
-
-
-if [ "$#" != "1" ] || [ ! -f "$1" ]; then
-       log "[Error] Usage: $0 path_to_delta.tar[.gz]" "$LOG_FILE"
-       exit 1
-fi
-
-if tar ztf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
-       DELTA_TAR="$FOTA_DIR/delta.tar.gz"
-       DELTA_TAR_GZ="TRUE"
-elif tar tf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
-       DELTA_TAR="$FOTA_DIR/delta.tar"
-else
-       log "[Error] Usage $0 path_to_delta.tar[.gz]" "$LOG_FILE"
-       exit 1
-fi
-
-log "[Info] Using <$DELTA_TAR> delta file." "$LOG_FILE"
-
-flash_pre_image() {
-       log "[Info] Flash images for update..." "$LOG_FILE"
-       CONFIG_FILE="update.cfg"
-
-       /bin/tar xvfp "$DELTA_TAR" -C "$FOTA_DIR" "$CONFIG_FILE"
-       if [ ! -e "$FOTA_DIR/$CONFIG_FILE" ]; then
-               critical_log "[Error] There is no $CONFIG_FILE" "$LOG_FILE"
-               return
-       fi
-
-       while read -r PART_NAME DELTA_NAME TYPE DEV _OFFSET _SIZE _HASH1 _HASH2
-       do
-               if [ "$TYPE" = "FULL_IMAGE:BEFORE_BOOT_FOTA" ]; then
-                       if ! /bin/tar tf "$DELTA_TAR" "$DELTA_NAME"; then
-                               log "[Info] There is no delta for $PART_NAME" "$LOG_FILE"
-                               continue
-                       fi
-
-                       EMMC_DEVICE="/dev/mmcblk0"
-                       DEV_NUM=$(/sbin/partx -s "$EMMC_DEVICE" | sed "\|$PART_NAME|!d")
-                       if [ "$DEV_NUM" != "" ]; then
-                               DEV_NUM="$(echo "$DEV_NUM"| \
-                                       { read -r NUM REST; echo "$NUM"; })"
-                       fi
-                       if [ "$DEV_NUM" == "" ]; then
-                               DEV_NUM=$(/sbin/blkid -L "$PART_NAME" -o device -l | sed "\|$EMMC_DEVICE|!d" | \
-                                               sed 's/\/dev\/mmcblk0p//')
-                       fi
-                       if [ "$DEV_NUM" != "" ]; then
-                               DEV="${EMMC_DEVICE}p${DEV_NUM}"
-                       fi
-
-                       log "[Info] Flashing $DELTA_NAME... to $DEV" "$LOG_FILE"
-                       /bin/tar xOf "$DELTA_TAR" "$DELTA_NAME" > "$DEV"
-               fi
-       done < "$FOTA_DIR/$CONFIG_FILE"
-}
-
-if [ "$DOWNLOAD_DELTA" -ef "$DELTA_TAR" ]; then
-       log "[Info] delta.tar[.gz] is already placed in correct directory." "$LOG_FILE"
-else
-       log "[Info] Copy delta.tar[.gz]..." "$LOG_FILE"
-       /bin/cp "$DOWNLOAD_DELTA" "$DELTA_TAR"
-fi
-
-# delta.tar.gz has to be uncompressed to .tar beacause ua and libtota does not support .tar.gz
-if [ "$DELTA_TAR_GZ" == "TRUE" ]; then
-       gunzip -c "$DOWNLOAD_DELTA" > "$FOTA_DIR/delta.tar"
-       rm "$DELTA_TAR"
-       DELTA_TAR="$FOTA_DIR/delta.tar"
-fi
-
-sync
-
-# Run setup script if exist
-run_setup_script "$DELTA_TAR"
-
-# 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
-log "[Info] Extract delta.ua..." "$LOG_FILE"
-unpack_file "$DELTA_TAR" delta.ua
-
-# FOTA: /usr/bin/rw-update-prepare.sh
-
-# Write delta saved path
-log "[Info] Write paths..." "$LOG_FILE"
-echo "$FOTA_DIR" > "$STATUS_DIR/DELTA.PATH"
-dirname "$DOWNLOAD_DELTA" > "$STATUS_DIR/DOWNLOAD.PATH"
-sync
-
-# go to fota mode
-log "[Info] Go TOTA update..." "$LOG_FILE"
-if ! /sbin/reboot fota; then
-       critical_log "[Error] Failed to reboot fota" "$LOG_FILE"
-       exit 100
-fi
-
-critical_log "RO update: $SCRIPT_NAME success" "$LOG_FILE"

diff --git a/scripts/upgrade-support/upgrade-trigger.sh b/scripts/upgrade-support/upgrade-trigger.sh
index f62f81b..fedc98b 100644 (file)
--- a/scripts/upgrade-support/upgrade-trigger.sh
+++ b/scripts/upgrade-support/upgrade-trigger.sh
@@ -14,7 +14,6 @@ STATUS_DIR="/opt/data/update"
 DOWNLOAD_DELTA="$1"
 SCRIPT_NAME="upgrade-trigger.sh"
 LOG_FILE="/tmp/upgrade-trigger.log"
-SCRIPT_UPGRADE_LEGACY="upgrade-legacy.sh"
 SCRIPT_UPGRADE_PREPARE_PARTITIONS="upgrade-prepare-partitions.sh"
 SCRIPT_UPGRADE_PARTIAL="upgrade-partial.sh"
 SCRIPT_UPGRADE_FOTA="upgrade-fota.sh"
@@ -94,9 +93,9 @@ do_update() {
 
                set_upgrade_status 80
        else
-               # Legacy upgrade (non-A/B)
-               unpack_file "${DOWNLOAD_DELTA}" "${SCRIPT_UPGRADE_LEGACY}"
-               "${FOTA_DIR}/${SCRIPT_UPGRADE_LEGACY}" "${DOWNLOAD_DELTA}"
+               echo "[Error] Non-A/B upgrade is unsupported"
+               device_board_set_upgrade_status -1
+               exit 1
        fi
 }