From: Mateusz Moscicki <m.moscicki2@partner.samsung.com>
Date: Fri, 3 Jun 2022 14:49:43 +0000 (+0200)
Subject: Add upgrade-apply
X-Git-Tag: accepted/tizen/unified/20240419.110853~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2d0bce1a0540e86c26bcd12e0cd36a2e74bc5e9;p=platform%2Fcore%2Fsystem%2Fupgrade-tools.git

Add upgrade-apply

Change-Id: Idd1a48cf89a17bb74351672094cc1f471a2e973e
---

diff --git a/mk_delta/common/bin/mk_delta.sh b/mk_delta/common/bin/mk_delta.sh
index c6b1176..a951af8 100755
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -91,7 +91,6 @@ fn_set_default_params()
 	UPDATE_INFO_FILE=update-info.ini
 	UPDATE_INFO_PATH=./data/${UPDATE_INFO_FILE}
 	SETUP_SCRIPT_PATH=./cfg/setup.sh
-	DELTA_UA=./data/delta.ua
 	UPDATE_MANAGER=./data/upgrade-trigger.sh
 
 	LOG_PATH=./data/Delta.log
@@ -364,6 +363,7 @@ do
 	#--- extract files which would be appended to delta.tar ---
 	echo "Extract binaries for update from images"
 	fn_extract_from_image rootfs.img /usr/libexec/upgrade-support
+	fn_extract_from_image rootfs.img /usr/bin/upgrade-apply
 	fn_extract_from_image ramdisk-recovery.img /usr/bin/delta.ua
 
 	#--- archive result directory ---
diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh
index 57eab97..4ee572e 100755
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -53,6 +53,8 @@ fn_gen_metadata()
 
 	# Copy upgrade scripts
 	cp -Rd ${TMP_MNT_PNT}/usr/libexec/upgrade-support/* ${DELTA_DIR}
+	# Copy upgrade-apply
+	cp ${TMP_MNT_PNT}/usr/bin/upgrade-apply ${DELTA_DIR}
 	sudo umount ${TMP_MNT_PNT}
 
 	case "${BINOUT}" in