Rename upgrade types:

Types now include information in the name about what the upgrade is
(FULL_IMAGE, DELTA_IMAGE) and when it is to be performed
(BEFORE_BOOT_FOTA, AT_BOOT_FOTA):

  PRE_UA    -> FULL_IMAGE:BEFORE_BOOT_FOTA
  FULL_IMG  -> FULL_IMAGE:AT_BOOT_FOTA
  DELTA_IMG -> DELTA_IMAGE:AT_BOOT_FOTA

Change-Id: I31343d64a37156d0ca4673b9150cdfeb97f99ff4

diff --git a/mk_delta/artik530_710/cfg/delta.cfg b/mk_delta/artik530_710/cfg/delta.cfg
index d5aaa9b..2eee482 100644 (file)
--- a/mk_delta/artik530_710/cfg/delta.cfg
+++ b/mk_delta/artik530_710/cfg/delta.cfg
@@ -2,5 +2,5 @@
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 
 rootfs                         rootfs.img                              rootfs.img/                             DELTA_FS        /dev/mmcblk0p3                                  0
-ramdisk                                ramdisk.img                             ramdisk.img                             PRE_UA          /tmp/boot/ramdisk.img                   0
-ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /tmp/boot/ramdisk-recovery.img  0
+ramdisk                                ramdisk.img                             ramdisk.img                             FULL_IMAGE:BEFORE_BOOT_FOTA             /tmp/boot/ramdisk.img                   0
+ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /tmp/boot/ramdisk-recovery.img  0

diff --git a/mk_delta/common/bin/CreatePatch.py b/mk_delta/common/bin/CreatePatch.py
index fce79b6..75c371d 100755 (executable)
--- a/mk_delta/common/bin/CreatePatch.py
+++ b/mk_delta/common/bin/CreatePatch.py
@@ -60,9 +60,8 @@ def global_paths():
        global NEW_PREFIX
        global DIFFPATCH_UTIL
        global SUPPORT_CONTAINERS
-       global FULL_IMG
-       global DELTA_IMG
-       global DELTA_IMG_AB
+       global FULL_IMAGE
+       global DELTA_IMAGE
        global DELTA_FS
        global EXTRA
        global COMMON_BIN_PATH
@@ -85,12 +84,10 @@ PART_DOC_EXT = ".txt"
 DIFF_PREFIX = "diff"
 DIFF_SUFFIX = ".delta"
 NEW_PREFIX = 'new'
-FULL_IMG = "FULL_IMG"
-DELTA_IMG = "DELTA_IMG"
-DELTA_IMG_AB = "DELTA_IMG_AB"
+FULL_IMAGE = "FULL_IMAGE"
+DELTA_IMAGE = "DELTA_IMAGE"
 DELTA_FS = "DELTA_FS"
 EXTRA = "EXTRA"
-PRE_UA = "PRE_UA"
 LOGFILE = "Delta.log"
 VERBATIM_LIST = "Verbatim_List.txt"
 EMPTY = ""
@@ -114,6 +111,7 @@ def main():
                if len(sys.argv) < 5:
                        sys.exit('Usage: CreatePatch.py UPDATE_TYPE PARTNAME OLDBASE NEWBASE OUTFOLDER')
                UPDATE_TYPE = sys.argv[1]
+               UPDATE_TYPE_S = UPDATE_TYPE.split(":")
                PART_NAME = sys.argv[2]  # lets make this also optional
 
                BASE_OLD = sys.argv[3]
@@ -123,7 +121,7 @@ def main():
                ATTR_NEW = EMPTY
                UPDATE_CFG_PATH = EMPTY
                GenerateDiffAttr = "FALSE"
-               if UPDATE_TYPE == DELTA_FS:
+               if UPDATE_TYPE_S[0] == DELTA_FS:
                        #instead of arguments check it in outdirectory ?
                        if len(sys.argv) == 9:
                                ATTR_OLD = sys.argv[6]
@@ -131,7 +129,7 @@ def main():
                                UPDATE_CFG_PATH = '../'+sys.argv[8]
                                GenerateDiffAttr = "TRUE"
 
-               elif UPDATE_TYPE in [DELTA_IMG, DELTA_IMG_AB, FULL_IMG, PRE_UA]:
+               elif UPDATE_TYPE_S[0] in [DELTA_IMAGE, FULL_IMAGE]:
                        if len(sys.argv) == 7:
                                #Use path in better way
                                UPDATE_CFG_PATH = '../'+sys.argv[6]
@@ -165,11 +163,12 @@ def main():
                        print >> sys.stderr, "Basic utils missing -- ABORT"
                        sys.exit(1)
 
-               if UPDATE_TYPE == FULL_IMG:
+               if UPDATE_TYPE_S[0] == FULL_IMAGE:
                        SS_mk_full_img(BASE_OLD, BASE_NEW, OUT_DIR, PART_NAME, UPDATE_CFG_PATH)
-               elif UPDATE_TYPE == DELTA_IMG:
-                       SS_mk_delta_img(BASE_OLD, BASE_NEW, OUT_DIR, PART_NAME, UPDATE_CFG_PATH, COMPRESSION_LZMA)
-               elif UPDATE_TYPE == DELTA_IMG_AB:
+               # #### currently does not support LZMA ####
+               #  elif UPDATE_TYPE == DELTA_IMAGE:
+               #      SS_mk_delta_img(BASE_OLD, BASE_NEW, OUT_DIR, PART_NAME, UPDATE_CFG_PATH, COMPRESSION_LZMA)
+               elif UPDATE_TYPE_S[0] == DELTA_IMAGE:
                        SS_mk_delta_img(BASE_OLD, BASE_NEW, OUT_DIR, PART_NAME, UPDATE_CFG_PATH, COMPRESSION_BROTLI)
                elif UPDATE_TYPE == DELTA_FS:
                        AttributeFile = ATTR_NEW
@@ -185,9 +184,6 @@ def main():
 
                elif UPDATE_TYPE == EXTRA:
                        print('UPDATE_TYPE ---- EXTRA')
-               elif UPDATE_TYPE == PRE_UA:
-                       print('UPDATE_TYPE ---- PRE_UA')
-                       SS_pre_ua_update_checksum(PART_NAME, BASE_NEW, UPDATE_CFG_PATH)
                else:
                        print('UPDATE_TYPE ---- UNKNOWN FORMAT')
 
@@ -206,32 +202,6 @@ def main():
                logging.error('Usage: {} <Update_Type> <Part_Name> <OLD_Base> <NEW_Base> <OUT_DIR>'.format(os.path.basename(sys.argv[0])))
                raise
 
-def SS_pre_ua_update_checksum(PART_NAME, BASE_NEW, UPDATE_CFG_PATH):
-       newsize_d= os.path.getsize(BASE_NEW)
-       SHA_BIN_DEST= hash_file(BASE_NEW)
-
-       #incase UPDATE CFG is empty
-       DELTA = PART_NAME
-       #Should throw error if PART NAME NOT found??
-       print("newsize: {} sha_bin_dest: {}".format(newsize_d, SHA_BIN_DEST))
-       if not UPDATE_CFG_PATH == EMPTY:
-               f = open(UPDATE_CFG_PATH, 'r')
-               lines = f.readlines()
-               f.close()
-               f = open(UPDATE_CFG_PATH, 'w')
-               for line in lines:
-                       ConfigItems = line.split()
-                       if ConfigItems[0] == PART_NAME:
-                               logging.info ('Updating %s config' % PART_NAME)
-                               DELTA = ConfigItems[1]
-                               line = line.rstrip('\n')
-                               line = line.replace(line, line+'\t'+str(0)+'\t\t'+str(newsize_d)+'\t\t'+str(0)+'\t\t'+str(SHA_BIN_DEST)+'\n')
-                               print("new line: {}".format(line))
-                               f.write(line)
-                       else:
-                               f.write(line)
-               f.close()
-
 def SS_update_cfg(DELTA_BIN, UPDATE_CFG_PATH):
        f = open(UPDATE_CFG_PATH, 'r')
        lines = f.readlines()

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index a951af8..a3412c5 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -159,7 +159,7 @@ fn_process_extra_delta()
        if [ "${part_name}" = "RAMDISK2" ]; then
                if [ "${RAMDISK2_FULL_IMG}" = "0" ]; then
                        #--- delta recovery partition ---
-                       ${MK_PART_DELTA} ${part_name} DELTA_IMG ${part_bin} ${delta_bin}
+                       ${MK_PART_DELTA} ${part_name} DELTA_IMAGE:AT_BOOT_FOTA ${part_bin} ${delta_bin}
                        if [ "$?" = "0" ]; then
                                sudo mv data/${PART_OUT} ${RESULT_DIR}/${part_bin}
                                sudo mv ${RESULT_DIR}/${part_bin}/${delta_bin} ${DELTA_DIR}
@@ -167,7 +167,7 @@ fn_process_extra_delta()
                fi
                if [ "${RAMDISK2_FULL_IMG}" = "1" ]; then
                        #--- full recovery partition ---
-                       ${MK_PART_DELTA} ${part_name} FULL_IMG ${part_bin} ${delta_bin}
+                       ${MK_PART_DELTA} ${part_name} FULL_IMAGE:AT_BOOT_FOTA ${part_bin} ${delta_bin}
                        if [ "$?" = "0" ]; then
                                sudo mv data/${PART_OUT} ${RESULT_DIR}/${part_bin}
                                sudo mv ${RESULT_DIR}/${part_bin}/${part_bin} ${DELTA_DIR}

diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh
index 4ee572e..857e66e 100755 (executable)
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -151,7 +151,7 @@ fn_copy_image()
        sudo mv ${DIR_WITH_IMAGES}/${PART_BIN} ${DELTA_DIR}/${DELTA_BIN}
        sudo chown ${MY_ID}:${MY_ID} ${DELTA_DIR}/${PART_BIN}
 
-       echo -e "${PART_NAME}\t${DELTA_BIN}\tPRE_UA\t/dev/null\t0\t0\t${IMG_SIZE}\t0\t${SHA1_SUM}" >> ${UPDATE_CFG_PATH}
+       echo -e "${PART_NAME}\t${DELTA_BIN}\tFULL_IMAGE:BEFORE_BOOT_FOTA\t/dev/null\t0\t0\t${IMG_SIZE}\t0\t${SHA1_SUM}" >> ${UPDATE_CFG_PATH}
 }
 
 fn_make_delta_full()

diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh
index 6fe1d9b..780b9f4 100755 (executable)
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -576,7 +576,8 @@ NEW_TAR_FILE=
 fn_get_tar_file_names ${PART_BIN}
 
 if [ "z${OLD_TAR_FILE}" = "z" ]; then
-       if [ ! "${UPDATE_TYPE}" = "FULL_IMG" ] && [ ! "${UPDATE_TYPE}" = "PRE_UA" ]; then
+       UPDATE_TYPE_S=(${UPDATE_TYPE//:/ })
+       if [ ! "${UPDATE_TYPE_S[0]}" = "FULL_IMAGE" ]; then
                echo "[old] tar file does not exist in ${DATA_DIR}/${OLD_TAR_DIR} which contains ${PART_BIN}"
                #exit 0, cos this is not an error.
                exit 0
@@ -606,11 +607,12 @@ if [ ! -d ${OUTPUT_DIR} ]; then
        mkdir ${OUTPUT_DIR}
 fi
 
-if [ "${UPDATE_TYPE}" = "FULL_IMG" ] || [ "${UPDATE_TYPE}" = "PRE_UA" ]; then
+UPDATE_TYPE_S=(${UPDATE_TYPE//:/ })
+if [ "${UPDATE_TYPE_S[0]}" = "FULL_IMAGE" ]; then
        fn_mk_full_img
-elif [ "${UPDATE_TYPE}" = "DELTA_IMG" ] || [ "${UPDATE_TYPE}" = "DELTA_IMG_AB" ]; then
+elif [ "${UPDATE_TYPE_S[0]}" = "DELTA_IMAGE" ]; then
        fn_mk_delta_img
-elif [ "${UPDATE_TYPE}" = "DELTA_FS" ]; then
+elif [ "${UPDATE_TYPE_S[0]}" = "DELTA_FS" ]; then
        fn_mk_delta_fs
 else
        echo "Invalid update type"

diff --git a/mk_delta/rpi3/cfg/delta.cfg b/mk_delta/rpi3/cfg/delta.cfg
index 9b4640c..1228590 100644 (file)
--- a/mk_delta/rpi3/cfg/delta.cfg
+++ b/mk_delta/rpi3/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
-BOOT                   boot.img                boot.img                PRE_UA          /dev/mmcblk0p1  0
+BOOT                   boot.img                boot.img                FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p1  0
 hal                    hal.img                 hal.img/                DELTA_FS      /dev/mmcblk0p10 0
-modules                        modules.img             modules.img             PRE_UA          /dev/mmcblk0p6  0
+modules                        modules.img             modules.img             FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p6  0
 rootfs                 rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p2  0
-ramdisk                        ramdisk.img             ramdisk.img             FULL_IMG        /dev/mmcblk0p7  0
-ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p8  0
+ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p7  0
+ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p8  0

diff --git a/mk_delta/rpi4/cfg/delta.cfg b/mk_delta/rpi4/cfg/delta.cfg
index 9b4640c..1228590 100644 (file)
--- a/mk_delta/rpi4/cfg/delta.cfg
+++ b/mk_delta/rpi4/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
-BOOT                   boot.img                boot.img                PRE_UA          /dev/mmcblk0p1  0
+BOOT                   boot.img                boot.img                FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p1  0
 hal                    hal.img                 hal.img/                DELTA_FS      /dev/mmcblk0p10 0
-modules                        modules.img             modules.img             PRE_UA          /dev/mmcblk0p6  0
+modules                        modules.img             modules.img             FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p6  0
 rootfs                 rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p2  0
-ramdisk                        ramdisk.img             ramdisk.img             FULL_IMG        /dev/mmcblk0p7  0
-ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p8  0
+ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p7  0
+ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p8  0

diff --git a/mk_delta/tw1/cfg/delta.cfg b/mk_delta/tw1/cfg/delta.cfg
index 9706fca..8eb9ac6 100755 (executable)
--- a/mk_delta/tw1/cfg/delta.cfg
+++ b/mk_delta/tw1/cfg/delta.cfg
@@ -2,7 +2,7 @@
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
 rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p13         0
-boot           zImage                  delta.boot              DELTA_IMG       /dev/mmcblk0p6          0
-recovery       zImage-recovery         zImage-recovery         PRE_UA          /dev/mmcblk0p7          0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMG        /dev/mmcblk0p8          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p4          0
+boot           zImage                  delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p6          0
+recovery       zImage-recovery         zImage-recovery         FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p7          0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p4          0

diff --git a/mk_delta/tw2/cfg/delta.cfg b/mk_delta/tw2/cfg/delta.cfg
index 7d69d23..a69bb53 100755 (executable)
--- a/mk_delta/tw2/cfg/delta.cfg
+++ b/mk_delta/tw2/cfg/delta.cfg
@@ -2,7 +2,7 @@
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
 rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p15         0
-boot           dzImage                 delta.boot              DELTA_IMG       /dev/mmcblk0p8          0
-recovery       dzImage-recovery        dzImage-recovery        PRE_UA          /dev/mmcblk0p9          0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMG        /dev/mmcblk0p5          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p4          0
+boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
+recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p9          0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p5          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p4          0

diff --git a/mk_delta/tw3/cfg/delta.cfg b/mk_delta/tw3/cfg/delta.cfg
index 812429c..34ea8dc 100755 (executable)
--- a/mk_delta/tw3/cfg/delta.cfg
+++ b/mk_delta/tw3/cfg/delta.cfg
@@ -2,7 +2,7 @@
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
 rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p18         0
-boot           dzImage                 delta.boot              DELTA_IMG       /dev/mmcblk0p11         0
-recovery       dzImage-recovery        dzImage-recovery        PRE_UA          /dev/mmcblk0p12         0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMG        /dev/mmcblk0p8          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p7          0
+boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p11         0
+recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p12         0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p7          0