Integrate input config files

Change-Id: I69a90f0861f27418dc9500a963762d5018706811
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index 22d7939..a2ca51d 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -7,63 +7,16 @@
 
 #------------------------------------------------------------------------------
 # Function :
-#      fn_read_delta_cfg
-#
-# Description :
-#      read configuration file for delta generation.
-#      config file format : PART_NAME PART_BIN UPDATE_TYPE (deliminator : TAB)
-#
-
-fn_read_delta_cfg()
-{
-       in_file=$1
-
-       if [ ! -r ${in_file} ]; then
-               echo "file ${in_file} cannot be read"
-               return 1
-       fi
-
-       line_num=0
-       while read line
-       do
-               # skip comment line
-               if [ "${line:0:1}" = "#" ]; then
-                       continue
-               fi
-
-               # skip empty line
-               line_len=${#line}
-               if [ "${line_len}" = "0" ]; then
-                       continue
-               fi
-
-
-               fields=(${line})
-               PART_NAME_delta[${line_num}]=${fields[0]}
-               PART_BIN_delta[${line_num}]=${fields[1]}
-               UPDATE_TYPE_delta[${line_num}]=${fields[2]}
-
-               line_num=$(($line_num + 1))
-
-       done < ${in_file}
-
-       PART_NUM_delta=${line_num}
-
-       return 0
-}
-
-#------------------------------------------------------------------------------
-# Function :
-#      fn_read_part_cfg
+#      fn_gen_update_cfg
 #
 # Description :
-#      read configuration file for partition information.
-#      config file format : PART_NAME DELTA_BIN UPDATE_TYPE BLK_DEV BLK_OFFSET (deliminator : TAB)
-#
+#      read delta configuration file for generating update configuration file to be used during update.
+#      delta config file format : PART_NAME PART_BIN DELTA_BIN UPDATE_TYPE BLK_DEV BLK_OFFSET (deliminator : TAB)
 
-fn_read_part_cfg()
+fn_gen_update_cfg()
 {
        in_file=$1
+       out_file=$2
 
        if [ ! -r ${in_file} ]; then
                echo "file ${in_file} cannot be read"
@@ -86,63 +39,18 @@ fn_read_part_cfg()
 
 
                fields=(${line})
-               PART_NAME_part[${line_num}]=${fields[0]}
-               DELTA_BIN_part[${line_num}]=${fields[1]}
-               UPDATE_TYPE_part[${line_num}]=${fields[2]}
-               BLK_DEV_part[${line_num}]=${fields[3]}
-               BLK_OFFSET_part[${line_num}]=${fields[4]}
+               PART_NAME[${line_num}]=${fields[0]}
+               PART_BIN[${line_num}]=${fields[1]}
+               DELTA_BIN[${line_num}]=${fields[2]}
+               UPDATE_TYPE[${line_num}]=${fields[3]}
+               BLK_DEV[${line_num}]=${fields[4]}
+               BLK_OFFSET[${line_num}]=${fields[5]}
 
                line_num=$(($line_num + 1))
 
        done < ${in_file}
 
-       PART_NUM_part=${line_num}
-
-       return 0
-}
-
-#------------------------------------------------------------------------------
-# Function :
-#      fn_gen_update_cfg
-#
-# Description :
-#      generate configuration file to be used during update.
-#
-
-fn_gen_update_cfg()
-{
-       out_file=$1
-
-       update_idx=0
-
-       for ((delta_idx=0;delta_idx<PART_NUM_delta;delta_idx++))
-       do
-               FOUND=0
-               for ((part_idx=0;part_idx<PART_NUM_part;part_idx++))
-               do
-                       if [ "${PART_NAME_part[${part_idx}]}" = "${PART_NAME_delta[${delta_idx}]}" ]; then
-                               FOUND=1
-                               break
-                       fi
-               done
-
-               if [ "${FOUND}" = "1" ]; then
-                       #-- PART_NAME, DELTA_BIN, BLK_DEV, BLK_OFFSET are from part.cfg
-                       PART_NAME[${update_idx}]=${PART_NAME_part[${part_idx}]}
-                       DELTA_BIN[${update_idx}]=${DELTA_BIN_part[${part_idx}]}
-                       BLK_DEV[${update_idx}]=${BLK_DEV_part[${part_idx}]}
-                       BLK_OFFSET[${update_idx}]=${BLK_OFFSET_part[${part_idx}]}
-
-                       #-- PART_BIN, UPDATE_TYPE are from delta.cfg
-                       PART_BIN[${update_idx}]=${PART_BIN_delta[${delta_idx}]}
-                       UPDATE_TYPE[${update_idx}]=${UPDATE_TYPE_delta[${delta_idx}]}
-
-                       update_idx=$(($update_idx + 1))
-               fi
-
-       done
-
-       PART_NUM=${update_idx}
+       PART_NUM=${line_num}
 
        if [ -f ${out_file} ]; then
                sudo rm -fr ${out_file}
@@ -175,7 +83,6 @@ fn_set_default_params()
        MY_ID=`whoami`
        MK_PART_DELTA=${COMMON_BINDIR}/mk_part_delta.sh
        DELTA_CFG_PATH=./cfg/delta.cfg
-       PART_CFG_PATH=./cfg/default_part.cfg
        UPDATE_CFG_PATH=./cfg/update.cfg
        DELTA_UA=./data/delta.ua
        UPDATE_MANAGER=./data/upgrade-trigger.sh
@@ -225,10 +132,9 @@ fn_print_update_cfg()
                        echo "------------------------------"
                        echo "[PART_NAME]    ${PART_NAME[${update_idx}]}"
                        echo "[DELTA_BIN]    ${DELTA_BIN[${update_idx}]}"
+                       echo "[UPDATE_TYPE]  ${UPDATE_TYPE[${update_idx}]}"
                        echo "[BLK_DEV]      ${BLK_DEV[${update_idx}]}"
                        echo "[BLK_OFFSET]   ${BLK_OFFSET[${update_idx}]}"
-                       echo "[PART_BIN]     ${PART_BIN[${update_idx}]}"
-                       echo "[UPDATE_TYPE]  ${UPDATE_TYPE[${update_idx}]}"
 
        done
        echo "------------------------------"
@@ -276,11 +182,7 @@ COMMON_BINDIR=${PWD}/../common/bin
 
 fn_set_default_params
 
-fn_read_delta_cfg ${DELTA_CFG_PATH}
-
-fn_read_part_cfg ${PART_CFG_PATH}
-
-fn_gen_update_cfg ${UPDATE_CFG_PATH}
+fn_gen_update_cfg ${DELTA_CFG_PATH} ${UPDATE_CFG_PATH}
 
 ################### Make delta Forward and Backward #####################
 if [ "z${FW_BW}" = "z" ]; then

diff --git a/mk_delta/rpi3/cfg/default_part.cfg b/mk_delta/rpi3/cfg/default_part.cfg
deleted file mode 100644 (file)
index 220918d..0000000
--- a/mk_delta/rpi3/cfg/default_part.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default Partition information file
-# Partition Name (in PIT), delta name, update type, blk dev, blk offset
-
-ROOTFS         rootfs.img/                     DELTA_FS        /dev/mmcblk0p2          0
-RAMDISK1       ramdisk.img                     FULL_IMG        /dev/mmcblk0p7          0
-RAMDISK2       ramdisk-recovery.img            FULL_IMG        /dev/mmcblk0p8          0

diff --git a/mk_delta/rpi3/cfg/delta.cfg b/mk_delta/rpi3/cfg/delta.cfg
index 4f0859f..184c22e 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), update type
+# Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-ROOTFS         rootfs.img                      DELTA_FS
-RAMDISK1       ramdisk.img                     FULL_IMG
-RAMDISK2       ramdisk-recovery.img            FULL_IMG
+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

diff --git a/mk_delta/tw1/cfg/default_part.cfg b/mk_delta/tw1/cfg/default_part.cfg
deleted file mode 100755 (executable)
index 47d33f5..0000000
--- a/mk_delta/tw1/cfg/default_part.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Default Partition information file
-# Partition Name (in PIT), delta name, update type, blk dev, blk offset
-
-ROOTFS         rootfs.img/             DELTA_FS                /dev/mmcblk0p13         0
-BOOT           delta.boot              DELTA_IMG               /dev/mmcblk0p6          0
-RAMDISK1       ramdisk.img             FULL_IMG                /dev/mmcblk0p8          0
-RAMDISK2       ramdisk-recovery.img    FULL_IMG                /dev/mmcblk0p4          0

diff --git a/mk_delta/tw1/cfg/delta.cfg b/mk_delta/tw1/cfg/delta.cfg
index 9f1ad5b..55e1b6c 100755 (executable)
--- a/mk_delta/tw1/cfg/delta.cfg
+++ b/mk_delta/tw1/cfg/delta.cfg
@@ -1,7 +1,7 @@
 # Configuration for generation of delta
-# Partition Name (in PIT), bin name (in tar), update type
+# Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-ROOTFS         rootfs.img                      DELTA_FS
-BOOT           zImage                          DELTA_IMG
-RAMDISK1       ramdisk.img                     FULL_IMG
-RAMDISK2       ramdisk-recovery.img            FULL_IMG
+ROOTFS         rootfs.img                              rootfs.img/                             DELTA_FS                /dev/mmcblk0p13         0
+BOOT           zImage                                  delta.boot                              DELTA_IMG               /dev/mmcblk0p6          0
+RAMDISK1       ramdisk.img                             ramdisk.img                             FULL_IMG                /dev/mmcblk0p8          0
+RAMDISK2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMG                /dev/mmcblk0p4          0

diff --git a/mk_delta/tw2/cfg/default_part.cfg b/mk_delta/tw2/cfg/default_part.cfg
deleted file mode 100755 (executable)
index 06e0e80..0000000
--- a/mk_delta/tw2/cfg/default_part.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Default Partition information file
-# Partition Name (in PIT), delta name, update type, blk dev, blk offset
-
-ROOTFS         rootfs.img/             DELTA_FS                /dev/mmcblk0p15         0
-BOOT           delta.boot              DELTA_IMG               /dev/mmcblk0p8          0
-RAMDISK1       delta.ramdisk1          DELTA_IMG               /dev/mmcblk0p5          0
-RAMDISK2       delta.ramdisk2          DELTA_IMG               /dev/mmcblk0p4          0

diff --git a/mk_delta/tw2/cfg/delta.cfg b/mk_delta/tw2/cfg/delta.cfg
index f6a5ff6..b8d0354 100755 (executable)
--- a/mk_delta/tw2/cfg/delta.cfg
+++ b/mk_delta/tw2/cfg/delta.cfg
@@ -1,7 +1,7 @@
 # Configuration for generation of delta
-# Partition Name (in PIT), bin name (in tar), update type
+# Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-ROOTFS         rootfs.img                      DELTA_FS
-BOOT           dzImage                         DELTA_IMG
-RAMDISK1       ramdisk.img                     DELTA_IMG
-RAMDISK2       ramdisk-recovery.img            DELTA_IMG
+ROOTFS         rootfs.img                              rootfs.img/                     DELTA_FS                /dev/mmcblk0p15         0
+BOOT           dzImage                                 delta.boot                      DELTA_IMG               /dev/mmcblk0p8          0
+RAMDISK1       ramdisk.img                             delta.ramdisk1          DELTA_IMG               /dev/mmcblk0p5          0
+RAMDISK2       ramdisk-recovery.img    delta.ramdisk2          DELTA_IMG               /dev/mmcblk0p4          0