From a83bdb2359e23984872509044e7dd726788d43ea Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Fri, 9 Feb 2024 13:10:53 +0100 Subject: [PATCH] Add blkid-print 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: Ic73bd642a31b9402ec51fcbf1e87f6a13cdb9dfd --- 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 fe9d0fc..0b91608 100755 --- a/mk_delta/common/bin/mk_delta.sh +++ b/mk_delta/common/bin/mk_delta.sh @@ -108,6 +108,7 @@ 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" # Getting date and minor version MONDATE=$(date +%m%d) i=1 @@ -285,11 +286,13 @@ 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} 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}" # TODO buildstring? fi @@ -420,6 +423,7 @@ else 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} . fi diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh index 64f610a..5cf2d1a 100755 --- a/mk_delta/common/bin/mk_delta_full.sh +++ b/mk_delta/common/bin/mk_delta_full.sh @@ -82,6 +82,7 @@ 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" echo "===== Start writing image versions =====" local OLD_BUILD_STRING="0.0" @@ -97,6 +98,7 @@ 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}/ fi } diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh index 2f7ef41..9338fc5 100755 --- a/mk_delta/common/bin/mk_part_delta.sh +++ b/mk_delta/common/bin/mk_part_delta.sh @@ -83,6 +83,7 @@ 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 ROOTFS_MODEL_CONFIG_PATH=${MNT_PNT_OLD}"/etc/config/model-config.xml" local TIZEN_BUILD_CONFIG_PATH=${MNT_PNT_OLD}"/etc/tizen-build.conf" @@ -90,6 +91,7 @@ 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} # build string building echo "===== Start writing image versions =====" @@ -107,6 +109,7 @@ 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} fi } -- 2.7.4