Stop adding blkid-print to delta

blkid-print is dropped and no longer needed in the upgrade process.

Change-Id: Ic77b1a2eb8a632b6aaf38123aa962ab9a45a0f19

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index a271e869f4614a31d0c9b45bdfc0723af4f94c65..04de20c59ec47b2bc68b34fd85fab006549461b0 100755 (executable)
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -110,7 +110,6 @@ fn_set_default_params()
        UPGRADE_APPLY_BIN="upgrade-apply"
        UPGRADE_APPLY_DELTAFS_BIN="upgrade-apply-deltafs"
        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
@@ -290,7 +289,6 @@ fn_extract_files_from_partition()
                local UPGRADE_APPLY_PATH=${MNT_PNT}"/usr/bin/"${UPGRADE_APPLY_BIN}
                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}
                local COPY_BLOCKDEV_PATH=${MNT_PNT}"/bin/"${COPY_BLOCKDEV_BIN}
 
@@ -298,7 +296,6 @@ fn_extract_files_from_partition()
                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}"
                cp "${COPY_BLOCKDEV_PATH}" "${COPY_BLOCKDEV_BIN}"
 
@@ -440,7 +437,6 @@ if fn_get_tar_file_names rootfs.img "${OLD_TAR_DIR}"; then
                cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_DELTAFS_BIN} .
                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} .
                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 935c1e4ce0e2b831fa85ac76406f90d3bb8a65e1..71a3aab27e6edea112f348c64cacc97d59317745 100755 (executable)
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -82,7 +82,6 @@ fn_extract_needed_files()
                local UPGRADE_APPLY_PATH=${MNT_PNT}"/usr/bin/"${UPGRADE_APPLY}
                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"
                local COPY_BLOCKDEV_PATH=${MNT_PNT}"/bin/copy-blockdev"
 
@@ -100,7 +99,6 @@ fn_extract_needed_files()
                cp "${UPGRADE_APPLY_PATH}" ${DELTA_DIR}/
                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}/
                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 5103e7a888a440c42d30046ec53c4c9ffa71e8f4..614358c1aee5dbfafb52e06be68cd16b30ca90d5 100755 (executable)
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -83,7 +83,6 @@ fn_extract_needed_files()
                local UPGRADE_APPLY="upgrade-apply"
                local UPGRADE_APPLY_DELTAFS="upgrade-apply-deltafs"
                local DELTA_VERIFIER="delta-verifier"
-               local BLKID_PRINT="blkid-print"
                local RESIZE_DYNPARTS="resize-dynparts"
                local COPY_BLOCKDEV="copy-blockdev"
 
@@ -93,7 +92,6 @@ fn_extract_needed_files()
                local UPGRADE_APPLY_PATH=${MNT_PNT_NEW}"/usr/bin/"${UPGRADE_APPLY}
                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}
                local COPY_BLOCKDEV_PATH=${MNT_PNT_NEW}"/bin/"${COPY_BLOCKDEV}
 
@@ -113,7 +111,6 @@ fn_extract_needed_files()
                cp "${UPGRADE_APPLY_PATH}" ./${UPGRADE_APPLY}
                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}
                cp "${COPY_BLOCKDEV_PATH}" ./${COPY_BLOCKDEV}