From 897f82438ab9695bc7aec7c2df4a05cdaec8c0de Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Mon, 16 Jan 2023 17:05:27 +0100 Subject: [PATCH] Add delta-verifier 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: I382e591ae7f6e80bcccb6021b9a52accbb03b51c --- mk_delta/common/bin/mk_delta.sh | 4 ++++ mk_delta/common/bin/mk_delta_full.sh | 2 ++ mk_delta/common/bin/mk_part_delta.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh index 588f966..bc39675 100755 --- a/mk_delta/common/bin/mk_delta.sh +++ b/mk_delta/common/bin/mk_delta.sh @@ -107,6 +107,7 @@ fn_set_default_params() UPGRADE_SUPPORT_DIR="upgrade-support" UPGRADE_APPLY_BIN="upgrade-apply" UPGRADE_APPLY_DELTAFS_BIN="upgrade-apply-deltafs" + DELTA_VERIFIER_BIN="delta-verifier" # Getting date and minor version MONDATE=$(date +%m%d) i=1 @@ -285,10 +286,12 @@ fn_extract_files_from_partition() local UPGRADE_SUPPORT_PATH=${MNT_PNT}"/usr/libexec/"${UPGRADE_SUPPORT_DIR} 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} 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}" # TODO buildstring? fi @@ -418,6 +421,7 @@ else cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_BIN} . cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_DELTAFS_BIN} . cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_SUPPORT_DIR}/* . + cp "${EXTRACTED_FILES_DIR}"/${DELTA_VERIFIER_BIN} . fi diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh index 16b3271..64f610a 100755 --- a/mk_delta/common/bin/mk_delta_full.sh +++ b/mk_delta/common/bin/mk_delta_full.sh @@ -81,6 +81,7 @@ fn_extract_needed_files() local UPGRADE_SUPPORT_PATH=${MNT_PNT}"/usr/libexec/"${UPGRADE_SUPPORT} 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" echo "===== Start writing image versions =====" local OLD_BUILD_STRING="0.0" @@ -95,6 +96,7 @@ fn_extract_needed_files() cp "${UPGRADE_SUPPORT_PATH}"/* ${DELTA_DIR}/ cp "${UPGRADE_APPLY_PATH}" ${DELTA_DIR}/ cp "${UPGRADE_APPLY_DELTAFS_PATH}" ${DELTA_DIR}/ + cp "${DELTA_VERIFIER_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 ad7b5cc..2f7ef41 100755 --- a/mk_delta/common/bin/mk_part_delta.sh +++ b/mk_delta/common/bin/mk_part_delta.sh @@ -82,12 +82,14 @@ fn_extract_needed_files() local UPGRADE_SUPPORT="upgrade-support" local UPGRADE_APPLY="upgrade-apply" local UPGRADE_APPLY_DELTAFS="upgrade-apply-deltafs" + local DELTA_VERIFIER="delta-verifier" 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" local UPGRADE_SUPPORT_PATH=${MNT_PNT_NEW}"/usr/libexec/"${UPGRADE_SUPPORT} 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} # build string building echo "===== Start writing image versions =====" @@ -104,6 +106,7 @@ fn_extract_needed_files() cp -r "${UPGRADE_SUPPORT_PATH}" ./${UPGRADE_SUPPORT} cp "${UPGRADE_APPLY_PATH}" ./${UPGRADE_APPLY} cp "${UPGRADE_APPLY_DELTAFS_PATH}" ./${UPGRADE_APPLY_DELTAFS} + cp "${DELTA_VERIFIER_PATH}" ./${DELTA_VERIFIER} fi } -- 2.7.4