From 20f5456165196e041b81ecf9bb1c82b752f3a623 Mon Sep 17 00:00:00 2001
From: Antoni Adaszkiewicz <a.adaszkiewi@samsung.com>
Date: Mon, 21 Nov 2022 14:35:17 +0100
Subject: [PATCH] Extract upgrade-apply-deltafs binary form image during delta
 generation and append it to the delta.

Change-Id: I438619f91250e72a45df21c16dadf8e98759762e
---
 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 b1d0e10..39d1791 100755
--- a/mk_delta/common/bin/mk_delta.sh
+++ b/mk_delta/common/bin/mk_delta.sh
@@ -106,6 +106,7 @@ fn_set_default_params()
 	TIZEN_TARG_NAME=${EXTRACTED_FILES_DIR}/"tizen-build.conf"
 	UPGRADE_SUPPORT_DIR="upgrade-support"
 	UPGRADE_APPLY_BIN="upgrade-apply"
+	UPGRADE_APPLY_DELTAFS_BIN="upgrade-apply-deltafs"
 	# Getting date and minor version
 	MONDATE=$(date +%m%d)
 	i=1
@@ -283,9 +284,11 @@ 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_PATH=${MNT_PNT}"/usr/bin/"${UPGRADE_APPLY_DELTAFS_BIN}
 
 		cp "${UPGRADE_SUPPORT_PATH}"/* .
 		cp "${UPGRADE_APPLY_PATH}" "${UPGRADE_APPLY_BIN}"
+		cp "${UPGRADE_APPLY_DELTAFS_PATH}" "${UPGRADE_APPLY_DELTAFS_BIN}"
 
 		# TODO buildstring?
 	fi
@@ -413,6 +416,7 @@ if [ ! -r "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_BIN} ]; then
 	fn_extract_files_from_partition rootfs.img
 else
 	cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_BIN} .
+	cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_APPLY_DELTAFS_BIN} .
 	cp "${EXTRACTED_FILES_DIR}"/${UPGRADE_SUPPORT_DIR}/* .
 fi
 
diff --git a/mk_delta/common/bin/mk_delta_full.sh b/mk_delta/common/bin/mk_delta_full.sh
index dbdfd79..8b8d999 100755
--- a/mk_delta/common/bin/mk_delta_full.sh
+++ b/mk_delta/common/bin/mk_delta_full.sh
@@ -55,6 +55,8 @@ fn_gen_metadata()
 	cp -Rd ${TMP_MNT_PNT}/usr/libexec/upgrade-support/* ${DELTA_DIR}
 	# Copy upgrade-apply
 	cp ${TMP_MNT_PNT}/usr/bin/upgrade-apply ${DELTA_DIR}
+	# Copy upgrade-apply-deltafs
+	cp ${TMP_MNT_PNT}/usr/bin/upgrade-apply-deltafs ${DELTA_DIR}
 	sudo umount ${TMP_MNT_PNT}
 
 	case "${BINOUT}" in
diff --git a/mk_delta/common/bin/mk_part_delta.sh b/mk_delta/common/bin/mk_part_delta.sh
index 39c8d8f..ad7b5cc 100755
--- a/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@ -81,11 +81,13 @@ fn_extract_needed_files()
 		local TIZEN_TARG_NAME="tizen-build.conf"
 		local UPGRADE_SUPPORT="upgrade-support"
 		local UPGRADE_APPLY="upgrade-apply"
+		local UPGRADE_APPLY_DELTAFS="upgrade-apply-deltafs"
 
 		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}
 
 		# build string building
 		echo "===== Start writing image versions ====="
@@ -101,6 +103,7 @@ fn_extract_needed_files()
 		cp "${TIZEN_BUILD_CONFIG_PATH}" ./${TIZEN_TARG_NAME}
 		cp -r "${UPGRADE_SUPPORT_PATH}" ./${UPGRADE_SUPPORT}
 		cp "${UPGRADE_APPLY_PATH}" ./${UPGRADE_APPLY}
+		cp "${UPGRADE_APPLY_DELTAFS_PATH}" ./${UPGRADE_APPLY_DELTAFS}
 
 	fi
 }
-- 
2.7.4