Add resize-dynparts 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: Ia6f9c2eae3bc6a42ee3d10c6b7ec4aa1528c55a1

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index 0b91608..4889b5e 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -109,6 +109,7 @@ fn_set_default_params()
        UPGRADE_APPLY_DELTAFS_BIN="upgrade-apply-deltafs"
        DELTA_VERIFIER_BIN="delta-verifier"
        BLKID_PRINT_BIN="blkid-print"
+       RESIZE_DYNPARTS_BIN="resize-dynparts"
        # Getting date and minor version
        MONDATE=$(date +%m%d)
        i=1
@@ -287,12 +288,14 @@ fn_extract_files_from_partition()
                local UPGRADE_APPLY_DELTAFS_PATH=${MNT_PNT}"/usr/bin/"${UPGRADE_APPLY_DELTAFS_BIN}
                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}
 
                cp "${UPGRADE_SUPPORT_PATH}"/* .
                cp "${UPGRADE_APPLY_PATH}" "${UPGRADE_APPLY_BIN}"
                cp "${UPGRADE_APPLY_DELTAFS_PATH}" "${UPGRADE_APPLY_DELTAFS_BIN}"
                cp "${DELTA_VERIFIER_PATH}" "${DELTA_VERIFIER_BIN}"
                cp "${BLKID_PRINT_PATH}" "${BLKID_PRINT_BIN}"
+               cp "${RESIZE_DYNPARTS_PATH}" "${RESIZE_DYNPARTS_BIN}"
 
                # TODO buildstring?
        fi
@@ -424,6 +427,7 @@ else
        cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_SUPPORT_DIR}/* .
        cp "${EXTRACTED_FILES_DIR}"/${DELTA_VERIFIER_BIN} .
        cp "${EXTRACTED_FILES_DIR}"/${BLKID_PRINT_BIN} .
+       cp "${EXTRACTED_FILES_DIR}"/${RESIZE_DYNPARTS_BIN} .
 fi
 
 

diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh
index 5cf2d1a..a9876c3 100755 (executable)
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -83,6 +83,7 @@ fn_extract_needed_files()
                local UPGRADE_APPLY_DELTAFS_PATH=${MNT_PNT}"/usr/bin/"${UPGRADE_APPLY_DELTAFS}
                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"
 
                echo "===== Start writing image versions ====="
                local OLD_BUILD_STRING="0.0"
@@ -99,6 +100,7 @@ fn_extract_needed_files()
                cp "${UPGRADE_APPLY_DELTAFS_PATH}" ${DELTA_DIR}/
                cp "${DELTA_VERIFIER_PATH}" ${DELTA_DIR}/
                cp "${BLKID_PRINT_PATH}" ${DELTA_DIR}/
+               cp "${RESIZE_DYNPARTS_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 9338fc5..a66d70d 100755 (executable)
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -84,6 +84,7 @@ fn_extract_needed_files()
                local UPGRADE_APPLY_DELTAFS="upgrade-apply-deltafs"
                local DELTA_VERIFIER="delta-verifier"
                local BLKID_PRINT="blkid-print"
+               local RESIZE_DYNPARTS="resize-dynparts"
 
                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"
@@ -92,6 +93,7 @@ fn_extract_needed_files()
                local UPGRADE_APPLY_DELTAFS_PATH=${MNT_PNT_NEW}"/usr/bin/"${UPGRADE_APPLY_DELTAFS}
                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}
 
                # build string building
                echo "===== Start writing image versions ====="
@@ -110,6 +112,7 @@ fn_extract_needed_files()
                cp "${UPGRADE_APPLY_DELTAFS_PATH}" ./${UPGRADE_APPLY_DELTAFS}
                cp "${DELTA_VERIFIER_PATH}" ./${DELTA_VERIFIER}
                cp "${BLKID_PRINT_PATH}" ./${BLKID_PRINT}
+               cp "${RESIZE_DYNPARTS_PATH}" ./${RESIZE_DYNPARTS}
 
        fi
 }