From 941497e01915e4787397ef342143f88547c804e5 Mon Sep 17 00:00:00 2001 From: Jeon Sang-Heon Date: Mon, 31 Aug 2020 18:03:02 +0000 Subject: [PATCH] Change build information format - AS-IS : build_id.txt -> old=(old);'\n'new=(new); - TO-BE : build_string.txt -> (old)@(new) Change-Id: I79b3e39d459e9a24c3a60f8407c33df9876a2626 Signed-off-by: Jeon Sang-Heon --- mk_delta/common/bin/mk_delta.sh | 9 +++++---- mk_delta/common/bin/mk_part_delta.sh | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh index 2226ab2..50eef35 100755 --- a/mk_delta/common/bin/mk_delta.sh +++ b/mk_delta/common/bin/mk_delta.sh @@ -89,7 +89,8 @@ fn_set_default_params() UPDATE_MANAGER=./data/upgrade-trigger.sh LOG_PATH=./data/Delta.log - BUILD_ID_PATH=./data/build_id.txt + BUILD_STRING_FILE=build_string.txt + BUILD_STRING_PATH=./data/${BUILD_STRING_FILE} # Getting date and minor version MONDATE=$(date +%m%d) i=1 @@ -329,9 +330,9 @@ do sudo rm ${LOG_PATH} fi - if [ -r ${BUILD_ID_PATH} ]; then - sudo cp ${BUILD_ID_PATH} ${DELTA_DIR}/build_id.txt - sudo rm ${BUILD_ID_PATH} + if [ -r ${BUILD_STRING_PATH} ]; then + sudo cp ${BUILD_STRING_PATH} ${DELTA_DIR}/${BUILD_STRING_FILE} + sudo rm ${BUILD_STRING_PATH} fi if [ -r ${PRE_SCRIPT_PATH} ]; then sudo cp ${PRE_SCRIPT_PATH} ${DELTA_DIR}/pre.sh diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh index b2ff906..d5687dc 100755 --- a/mk_delta/common/bin/mk_part_delta.sh +++ b/mk_delta/common/bin/mk_part_delta.sh @@ -356,21 +356,24 @@ fn_mk_delta_fs() echo "===== Start writing image versions =====" local TMP_MNT_PNT="TMP_MNT_PNT" - local BUILD_FILE="build_id.txt" + local BUILD_STRING_FILE="build_string.txt" mkdir -p ${TMP_MNT_PNT} tar xvf ${OLD_TAR_DIR}/${OLD_TAR_FILE} ${PART_IMG_ORG} sudo mount -t ext4 -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT} - echo `cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build/old/"` > ${BUILD_FILE} + local OLD_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build=//" | sed "s/;$//"` sudo umount ${TMP_MNT_PNT} rm -rf ${PART_IMG_ORG} tar xvf ${NEW_TAR_DIR}/${NEW_TAR_FILE} ${PART_IMG_ORG} sudo mount -t ext4 -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT} - echo `cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build/new/"` >> ${BUILD_FILE} + local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build=//" | sed "s/;$//"` sudo umount ${TMP_MNT_PNT} rm -rf ${PART_IMG_ORG} + echo "${BUILD_STRING_FILE} : ${OLD_BUILD_STRING}@${NEW_BUILD_STRING}" + echo -n ${OLD_BUILD_STRING}@${NEW_BUILD_STRING} > ${BUILD_STRING_FILE} + rm -rf ${TMP_MNT_PNT} echo "===== Finish writing image versions =====" -- 2.7.4