From b0e37d6341d8b8bd1477fa5cdebd23c3fde5d889 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Thu, 9 Jun 2022 14:59:06 +0200 Subject: [PATCH] Use Date field from info.ini for old & new version string Change-Id: I79861a7d7f08166c191552a1c52b71256c51ecd6 --- mk_delta/common/bin/mk_delta_full.sh | 2 +- mk_delta/common/bin/mk_part_delta.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh index 857e66e..d7f91e1 100755 --- a/mk_delta/common/bin/mk_delta_full.sh +++ b/mk_delta/common/bin/mk_delta_full.sh @@ -48,7 +48,7 @@ fn_gen_metadata() local OLD_BUILD_STRING="0.0" sudo mount -o loop,ro ${ROOTFS_IMG} ${TMP_MNT_PNT} - local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Release=" | sed "s/Release=//" | sed "s/;$//"` + local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Date=" | sed "s/Date=//" | sed "s/;$//"` local BINOUT="$(LC_ALL=C LANG=C file -b ${TMP_MNT_PNT}/bin/ls)" # Copy upgrade scripts diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh index 780b9f4..a3ad1bf 100755 --- a/mk_delta/common/bin/mk_part_delta.sh +++ b/mk_delta/common/bin/mk_part_delta.sh @@ -31,13 +31,13 @@ fn_gen_metadata() tar xvf ${OLD_TAR_DIR}/${OLD_TAR_FILE} ${PART_IMG_ORG} sudo mount -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT} - local OLD_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Release=" | sed "s/Release=//" | sed "s/;$//"` + local OLD_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Date=" | sed "s/Date=//" | 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 -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT} - local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Release=" | sed "s/Release=//" | sed "s/;$//"` + local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Date=" | sed "s/Date=//" | sed "s/;$//"` local BINOUT="$(LC_ALL=C LANG=C file -b ${TMP_MNT_PNT}/bin/ls)" sudo umount ${TMP_MNT_PNT} rm -rf ${PART_IMG_ORG} -- 2.7.4