Merge some patches for ARTIK

- Update ARTIK ramdisk as PRE_UA
- Include pre-script if exist

Change-Id: I4143a981b9bb80b2531bfa033700c836e51da3ca

diff --git a/mk_delta/artik530_710/cfg/delta.cfg b/mk_delta/artik530_710/cfg/delta.cfg
index 1f30c1e..d5aaa9b 100644 (file)
--- a/mk_delta/artik530_710/cfg/delta.cfg
+++ b/mk_delta/artik530_710/cfg/delta.cfg
@@ -1,7 +1,6 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 
-rootfs                 rootfs.img              rootfs.img/     DELTA_FS        /dev/mmcblk0p3  0
-# TODO : make a new update type for ramdisk
-#ramdisk                       ramdisk.img             N/A             EXCLUDED        N/A             N/A
-#ramdisk-recovery      ramdisk-recovery.img    N/A             EXCLUDED        N/A             N/A
+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

diff --git a/mk_delta/artik530_710/cfg/pre.sh b/mk_delta/artik530_710/cfg/pre.sh
new file mode 100755 (executable)
index 0000000..7cabe9f
--- /dev/null
+++ b/mk_delta/artik530_710/cfg/pre.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Mount boot image for updating ramdisk(-recovery)
+mkdir -p /tmp/boot
+mount LABEL=boot /tmp/boot

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index 05b081d..9864b32 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -84,6 +84,7 @@ fn_set_default_params()
        MK_PART_DELTA=${COMMON_BINDIR}/mk_part_delta.sh
        DELTA_CFG_PATH=./cfg/delta.cfg
        UPDATE_CFG_PATH=./cfg/update.cfg
+       PRE_SCRIPT_PATH=./cfg/pre.sh
        DELTA_UA=./data/delta.ua
        UPDATE_MANAGER=./data/upgrade-trigger.sh
 
@@ -326,6 +327,9 @@ do
                sudo cp ${LOG_PATH} ${RESULT_DIR}/Delta.log
                sudo rm ${LOG_PATH}
        fi
+       if [ -r ${PRE_SCRIPT_PATH} ]; then
+               sudo cp ${PRE_SCRIPT_PATH} ${DELTA_DIR}/pre.sh
+       fi
 
        #--- extract files which would be appended to delta.tar ---
        echo "Extract binaries for update from images"