Use valid label which is available in all targets

Because RPi3 and ARTIK target don't set partition name, it is invalid
in RPi3's config file. Change it to filesystem label which is
available in RPi3 and ARTIK target.
In addition, all reference targets are using partition/filesystem
name in lowercase. So use it as a default.

Change-Id: I49da6831b8663118af698f4e0733a8cba8d972b8
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/mk_delta/artik530_710/cfg/delta.cfg b/mk_delta/artik530_710/cfg/delta.cfg
index 1396125..4001588 100644 (file)
--- a/mk_delta/artik530_710/cfg/delta.cfg
+++ b/mk_delta/artik530_710/cfg/delta.cfg
@@ -1,7 +1,7 @@
 # Configuration for generation of delta
-# Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
+# Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 
-ROOTFS         rootfs.img                              rootfs.img/                                     DELTA_FS        /dev/mmcblk0p3          0
+rootfs                 rootfs.img              rootfs.img/     DELTA_FS        /dev/mmcblk0p3  0
 # TODO : make a new update type for ramdisk
-RAMDISK1       ramdisk.img                             N/A                                                     EXCLUDED        N/A                                     N/A
-RAMDISK2       ramdisk-recovery.img    N/A                                                     EXCLUDED        N/A                                     N/A
+ramdisk                        ramdisk.img             N/A             EXCLUDED        N/A             N/A
+ramdisk-recovery       ramdisk-recovery.img    N/A             EXCLUDED        N/A             N/A

diff --git a/mk_delta/common/bin/CreatePatch.py b/mk_delta/common/bin/CreatePatch.py
index 3974105..318d47e 100755 (executable)
--- a/mk_delta/common/bin/CreatePatch.py
+++ b/mk_delta/common/bin/CreatePatch.py
@@ -257,7 +257,7 @@ def SS_mk_delta_img(BASE_OLD, BASE_NEW, OUT_DIR, DELTA_BIN, UPDATE_CFG_PATH):
                f.close()
 
        #Any validation checks required?
-       if (DELTA_BIN == "zImage" or DELTA_BIN == "dzImage" or DELTA_BIN == "KERNEL" or DELTA_BIN == "BOOT") and SUPPORT_DZIMAGE == "TRUE":
+       if (DELTA_BIN == "zImage" or DELTA_BIN == "dzImage" or DELTA_BIN == "KERNEL" or DELTA_BIN == "BOOT" or DELTA_BIN == "boot" or DELTA_BIN == "recovery") and SUPPORT_DZIMAGE == "TRUE":
 
                #Unpack Old and New Images for creating delta
                subprocess.call([ZIMAGE_SCRIPT, '-u', BASE_OLD])

diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh
index cb2fc9b..fc7e875 100755 (executable)
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -350,39 +350,31 @@ fn_mk_delta_fs()
 
        #--- !!! this should be modified according to partition ---
        case "${PART_NAME}" in
-       "ROOTFS")
+       "rootfs" )
                EXCLUDE_FILES="lost+found dev proc tmp var sys csa"
                TGT_MNT_PNT=${FAKE_ROOT}
                ;;
-       "CSC")
-               EXCLUDE_FILES="lost+found"
-               TGT_MNT_PNT=${FAKE_ROOT}/opt/system/csc
-               ;;
-       "MODULE")
-               EXCLUDE_FILES="lost+found"
-               TGT_MNT_PNT=${FAKE_ROOT}/lib/modules
-               ;;
-       "RAMDISK1")
+       "ramdisk1" | "ramdisk" )
                EXCLUDE_FILES="lost+found dev proc tmp sys"
                TGT_MNT_PNT=${FAKE_ROOT}/mnt/initrd
                ;;
-       "RAMDISK2")
+       "ramdisk2" | "ramdisk-recovery" )
                EXCLUDE_FILES="lost+found"
                TGT_MNT_PNT=${FAKE_ROOT}/mnt/initrd-recovery
                ;;
-       "USER")
+       "user" )
                EXCLUDE_FILES="lost+found"
                TGT_MNT_PNT=${FAKE_ROOT}/opt/usr
                ;;
-       "SYSDATA")
+       "system-data" )
                EXCLUDE_FILES="lost+found"
                TGT_MNT_PNT=${FAKE_ROOT}/opt
                ;;
-       "KERNEL")
+       "kernel" | "boot" )
                EXCLUDE_FILES=""
                TGT_MNT_PNT=${FAKE_ROOT}/boot
                ;;
-       *)
+       * )
                echo "${PART_NAME} not supported !!!"
                return 1
                ;;
@@ -563,11 +555,14 @@ NEW_TAR_FILE=
 
 fn_get_tar_file_names ${PART_BIN}
 
-if [ "${PART_NAME}" = "RAMDISK2" ]; then
-       fn_extract_from_image ${PART_BIN} /usr/bin/delta.ua
-elif [ "${PART_NAME}" = "ROOTFS" ]; then
-       fn_extract_from_image ${PART_BIN} /usr/bin/upgrade-trigger.sh
-fi
+case "${PART_NAME}" in
+       "ramdisk2" | "ramdisk-recovery" )
+               fn_extract_from_image ${PART_BIN} /usr/bin/delta.ua
+               ;;
+       "rootfs" )
+               fn_extract_from_image ${PART_BIN} /usr/bin/upgrade-trigger.sh
+               ;;
+esac
 
 if [ "${UPDATE_TYPE}" = "EXCLUDED" ]; then
        exit 0

diff --git a/mk_delta/rpi3/cfg/delta.cfg b/mk_delta/rpi3/cfg/delta.cfg
index 184c22e..f3e0a34 100644 (file)
--- a/mk_delta/rpi3/cfg/delta.cfg
+++ b/mk_delta/rpi3/cfg/delta.cfg
@@ -1,6 +1,6 @@
 # Configuration for generation of delta
-# Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
+# Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 
-ROOTFS         rootfs.img                              rootfs.img/                                     DELTA_FS        /dev/mmcblk0p2          0
-RAMDISK1       ramdisk.img                             ramdisk.img                                     FULL_IMG        /dev/mmcblk0p7          0
-RAMDISK2       ramdisk-recovery.img    ramdisk-recovery.img            FULL_IMG        /dev/mmcblk0p8          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

diff --git a/mk_delta/tw1/cfg/delta.cfg b/mk_delta/tw1/cfg/delta.cfg
index 3a38a8e..9706fca 100755 (executable)
--- a/mk_delta/tw1/cfg/delta.cfg
+++ b/mk_delta/tw1/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # 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                             PRE_UA          /dev/mmcblk0p8          0
-RAMDISK2       ramdisk-recovery.img    ramdisk-recovery.img    PRE_UA          /dev/mmcblk0p4          0
+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

diff --git a/mk_delta/tw2/cfg/delta.cfg b/mk_delta/tw2/cfg/delta.cfg
index 89ac6d4..ced59b0 100755 (executable)
--- a/mk_delta/tw2/cfg/delta.cfg
+++ b/mk_delta/tw2/cfg/delta.cfg
@@ -1,8 +1,7 @@
 # Configuration for generation of delta
 # 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             PRE_UA          /dev/mmcblk0p5          0
-RAMDISK2       ramdisk-recovery.img    ramdisk-recovery.img            PRE_UA          /dev/mmcblk0p4          0
+rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p15         0
+boot           dzImage                 delta.boot              DELTA_IMG       /dev/mmcblk0p8          0
+ramdisk1       ramdisk.img             delta.ramdisk1          FULL_IMG        /dev/mmcblk0p5          0
+ramdisk2       ramdisk-recovery.img    delta.ramdisk2          PRE_UA          /dev/mmcblk0p4          0