Add copy-blockdev to delta.tar

So that the upgrade package provides the tools that are needed during
the upgrade and which may not be on the system.

Change-Id: I58eefebdd2c8eb38217a2a012c0820c593a55147

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index 4889b5e..e250d42 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -110,6 +110,7 @@ fn_set_default_params()
        DELTA_VERIFIER_BIN="delta-verifier"
        BLKID_PRINT_BIN="blkid-print"
        RESIZE_DYNPARTS_BIN="resize-dynparts"
+       COPY_BLOCKDEV_BIN="copy-blockdev"
        # Getting date and minor version
        MONDATE=$(date +%m%d)
        i=1
@@ -289,6 +290,7 @@ fn_extract_files_from_partition()
                local DELTA_VERIFIER_PATH=${MNT_PNT}"/usr/bin/"${DELTA_VERIFIER_BIN}
                local BLKID_PRINT_PATH=${MNT_PNT}"/usr/bin/"${BLKID_PRINT_BIN}
                local RESIZE_DYNPARTS_PATH=${MNT_PNT}"/bin/"${RESIZE_DYNPARTS_BIN}
+               local COPY_BLOCKDEV_PATH=${MNT_PNT}"/bin/"${COPY_BLOCKDEV_BIN}
 
                cp "${UPGRADE_SUPPORT_PATH}"/* .
                cp "${UPGRADE_APPLY_PATH}" "${UPGRADE_APPLY_BIN}"
@@ -296,6 +298,7 @@ fn_extract_files_from_partition()
                cp "${DELTA_VERIFIER_PATH}" "${DELTA_VERIFIER_BIN}"
                cp "${BLKID_PRINT_PATH}" "${BLKID_PRINT_BIN}"
                cp "${RESIZE_DYNPARTS_PATH}" "${RESIZE_DYNPARTS_BIN}"
+               cp "${COPY_BLOCKDEV_PATH}" "${COPY_BLOCKDEV_BIN}"
 
                # TODO buildstring?
        fi
@@ -428,6 +431,7 @@ else
        cp "${EXTRACTED_FILES_DIR}"/${DELTA_VERIFIER_BIN} .
        cp "${EXTRACTED_FILES_DIR}"/${BLKID_PRINT_BIN} .
        cp "${EXTRACTED_FILES_DIR}"/${RESIZE_DYNPARTS_BIN} .
+       cp "${EXTRACTED_FILES_DIR}"/${COPY_BLOCKDEV_BIN} .
 fi
 
 

diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh
index a9876c3..fbdb39b 100755 (executable)
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -84,6 +84,7 @@ fn_extract_needed_files()
                local DELTA_VERIFIER_PATH=${MNT_PNT}"/usr/bin/delta-verifier"
                local BLKID_PRINT_PATH=${MNT_PNT}"/usr/bin/blkid-print"
                local RESIZE_DYNPARTS_PATH=${MNT_PNT}"/bin/resize-dynparts"
+               local COPY_BLOCKDEV_PATH=${MNT_PNT}"/bin/copy-blockdev"
 
                echo "===== Start writing image versions ====="
                local OLD_BUILD_STRING="0.0"
@@ -101,6 +102,7 @@ fn_extract_needed_files()
                cp "${DELTA_VERIFIER_PATH}" ${DELTA_DIR}/
                cp "${BLKID_PRINT_PATH}" ${DELTA_DIR}/
                cp "${RESIZE_DYNPARTS_PATH}" ${DELTA_DIR}/
+               cp "${COPY_BLOCKDEV_PATH}" ${DELTA_DIR}/
        fi
 }
 

diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh
index a66d70d..937e9c6 100755 (executable)
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -85,6 +85,7 @@ fn_extract_needed_files()
                local DELTA_VERIFIER="delta-verifier"
                local BLKID_PRINT="blkid-print"
                local RESIZE_DYNPARTS="resize-dynparts"
+               local COPY_BLOCKDEV="copy-blockdev"
 
                local ROOTFS_MODEL_CONFIG_PATH=${MNT_PNT_OLD}"/etc/config/model-config.xml"
                local TIZEN_BUILD_CONFIG_PATH=${MNT_PNT_OLD}"/etc/tizen-build.conf"
@@ -94,6 +95,7 @@ fn_extract_needed_files()
                local DELTA_VERIFIER_PATH=${MNT_PNT_NEW}"/usr/bin/"${DELTA_VERIFIER}
                local BLKID_PRINT_PATH=${MNT_PNT_NEW}"/usr/bin/"${BLKID_PRINT}
                local RESIZE_DYNPARTS_PATH=${MNT_PNT_NEW}"/bin/"${RESIZE_DYNPARTS}
+               local COPY_BLOCKDEV_PATH=${MNT_PNT_NEW}"/bin/"${COPY_BLOCKDEV}
 
                # build string building
                echo "===== Start writing image versions ====="
@@ -113,6 +115,7 @@ fn_extract_needed_files()
                cp "${DELTA_VERIFIER_PATH}" ./${DELTA_VERIFIER}
                cp "${BLKID_PRINT_PATH}" ./${BLKID_PRINT}
                cp "${RESIZE_DYNPARTS_PATH}" ./${RESIZE_DYNPARTS}
+               cp "${COPY_BLOCKDEV_PATH}" ./${COPY_BLOCKDEV}
 
        fi
 }