From 60d44b759c9f84e63de7a8e80aa63389c5a877d0 Mon Sep 17 00:00:00 2001
From: Antoni Adaszkiewicz <a.adaszkiewi@samsung.com>
Date: Thu, 1 Sep 2022 13:28:55 +0200
Subject: [PATCH] Rename delta-ua directory to upgrade-apply-deltafs and
 delta.ua binary to upgrade-apply-deltafs

Change-Id: I0f7ad405d7a2cbc055fbd1649597c2f46fc52e9c
---
 CMakeLists.txt                                                    | 2 +-
 data/40-upgrade.list.in                                           | 1 -
 packaging/upgrade.spec                                            | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/CMakeLists.txt            | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_ApplyPatch.c    | 0
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Common.c        | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Common.h        | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Engine_Errors.h | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_FSUpdate.c      | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_FSUpdate.h      | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_PatchDelta.c    | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_PatchDelta.h    | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_UPI.c           | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/SS_UPI.h           | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/fota_common.h      | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/fota_log.c         | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/fota_log.h         | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/fota_tar.c         | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/engine/fota_tar.h         | 2 +-
 .../engine/ss_bspatch_common.c                                    | 0
 .../engine/ss_bspatch_common.h                                    | 0
 src/{delta-ua => upgrade-apply-deltafs}/engine/ua_types.h         | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/fota_cfg.c                | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/fota_cfg.h                | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/fota_util.c               | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/fota_util.h               | 2 +-
 src/{delta-ua => upgrade-apply-deltafs}/ua.c                      | 8 ++++----
 src/{delta-ua => upgrade-apply-deltafs}/ua.h                      | 2 +-
 28 files changed, 27 insertions(+), 28 deletions(-)
 rename src/{delta-ua => upgrade-apply-deltafs}/CMakeLists.txt (96%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_ApplyPatch.c (100%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Common.c (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Common.h (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_Engine_Errors.h (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_FSUpdate.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_FSUpdate.h (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_PatchDelta.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_PatchDelta.h (98%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_UPI.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/SS_UPI.h (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/fota_common.h (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/fota_log.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/fota_log.h (98%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/fota_tar.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/fota_tar.h (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/ss_bspatch_common.c (100%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/ss_bspatch_common.h (100%)
 rename src/{delta-ua => upgrade-apply-deltafs}/engine/ua_types.h (98%)
 rename src/{delta-ua => upgrade-apply-deltafs}/fota_cfg.c (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/fota_cfg.h (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/fota_util.c (99%)
 rename src/{delta-ua => upgrade-apply-deltafs}/fota_util.h (97%)
 rename src/{delta-ua => upgrade-apply-deltafs}/ua.c (98%)
 rename src/{delta-ua => upgrade-apply-deltafs}/ua.h (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 439f010..310f4c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 ADD_SUBDIRECTORY(src/dmverity)
 ADD_SUBDIRECTORY(src/img-verifier)
 ADD_SUBDIRECTORY(src/upgrade-apply)
-ADD_SUBDIRECTORY(src/delta-ua)
+ADD_SUBDIRECTORY(src/upgrade-apply-deltafs)
 ADD_SUBDIRECTORY(src/blkid-print)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(scripts/rw-upgrade)
diff --git a/data/40-upgrade.list.in b/data/40-upgrade.list.in
index ad15233..f927f86 100644
--- a/data/40-upgrade.list.in
+++ b/data/40-upgrade.list.in
@@ -1,7 +1,6 @@
 # ---- Target contents ----------------------------------------------------- #
 WITHLIBS="
 ${CMAKE_INSTALL_LIBDIR}/libcrypto.so.1.1
-${CMAKE_INSTALL_LIBDIR}/libtota.so.1.0.0
 /usr/bin/verity_handler
 /usr/sbin/img-verifier
 /bin/sed
diff --git a/packaging/upgrade.spec b/packaging/upgrade.spec
index cf88573..b048365 100644
--- a/packaging/upgrade.spec
+++ b/packaging/upgrade.spec
@@ -136,7 +136,7 @@ fi
 %{upgrade_support_dir}/upgrade-common.inc
 %{_bindir}/upgrade-apply
 %{_bindir}/verity_handler
-%{_bindir}/delta.ua
+%{_bindir}/upgrade-apply-deltafs
 %{_bindir}/blkid-print
 # Image verifier
 %{_sbindir}/img-verifier
diff --git a/src/delta-ua/CMakeLists.txt b/src/upgrade-apply-deltafs/CMakeLists.txt
similarity index 96%
rename from src/delta-ua/CMakeLists.txt
rename to src/upgrade-apply-deltafs/CMakeLists.txt
index 9b5c61f..7944b59 100644
--- a/src/delta-ua/CMakeLists.txt
+++ b/src/upgrade-apply-deltafs/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDFOREACH(flag)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -I./include")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
-SET(EXECNAME "delta.ua")
+SET(EXECNAME "upgrade-apply-deltafs")
 SET(BINDIR "/usr/bin")
 ADD_EXECUTABLE(${EXECNAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${EXECNAME} ${${PROJECT_NAME}_pkgs_LDFLAGS} "-g" "-pthread")
diff --git a/src/delta-ua/engine/SS_ApplyPatch.c b/src/upgrade-apply-deltafs/engine/SS_ApplyPatch.c
similarity index 100%
rename from src/delta-ua/engine/SS_ApplyPatch.c
rename to src/upgrade-apply-deltafs/engine/SS_ApplyPatch.c
diff --git a/src/delta-ua/engine/SS_Common.c b/src/upgrade-apply-deltafs/engine/SS_Common.c
similarity index 97%
rename from src/delta-ua/engine/SS_Common.c
rename to src/upgrade-apply-deltafs/engine/SS_Common.c
index fe4c74d..605481e 100755
--- a/src/delta-ua/engine/SS_Common.c
+++ b/src/upgrade-apply-deltafs/engine/SS_Common.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_Common.h b/src/upgrade-apply-deltafs/engine/SS_Common.h
similarity index 97%
rename from src/delta-ua/engine/SS_Common.h
rename to src/upgrade-apply-deltafs/engine/SS_Common.h
index 8a2caf1..20aae77 100755
--- a/src/delta-ua/engine/SS_Common.h
+++ b/src/upgrade-apply-deltafs/engine/SS_Common.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_Engine_Errors.h b/src/upgrade-apply-deltafs/engine/SS_Engine_Errors.h
similarity index 99%
rename from src/delta-ua/engine/SS_Engine_Errors.h
rename to src/upgrade-apply-deltafs/engine/SS_Engine_Errors.h
index 2fa68e9..bc6e25f 100755
--- a/src/delta-ua/engine/SS_Engine_Errors.h
+++ b/src/upgrade-apply-deltafs/engine/SS_Engine_Errors.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_FSUpdate.c b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c
similarity index 99%
rename from src/delta-ua/engine/SS_FSUpdate.c
rename to src/upgrade-apply-deltafs/engine/SS_FSUpdate.c
index d8d031f..78ca0f3 100755
--- a/src/delta-ua/engine/SS_FSUpdate.c
+++ b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_FSUpdate.h b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.h
similarity index 99%
rename from src/delta-ua/engine/SS_FSUpdate.h
rename to src/upgrade-apply-deltafs/engine/SS_FSUpdate.h
index 668bf61..5d40d2c 100755
--- a/src/delta-ua/engine/SS_FSUpdate.h
+++ b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_PatchDelta.c b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c
similarity index 99%
rename from src/delta-ua/engine/SS_PatchDelta.c
rename to src/upgrade-apply-deltafs/engine/SS_PatchDelta.c
index 9c87579..299f126 100755
--- a/src/delta-ua/engine/SS_PatchDelta.c
+++ b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c
@@ -1,5 +1,5 @@
 /*
- * libtota
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_PatchDelta.h b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.h
similarity index 98%
rename from src/delta-ua/engine/SS_PatchDelta.h
rename to src/upgrade-apply-deltafs/engine/SS_PatchDelta.h
index d8cb16a..09e5b9d 100755
--- a/src/delta-ua/engine/SS_PatchDelta.h
+++ b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_UPI.c b/src/upgrade-apply-deltafs/engine/SS_UPI.c
similarity index 99%
rename from src/delta-ua/engine/SS_UPI.c
rename to src/upgrade-apply-deltafs/engine/SS_UPI.c
index 7a168ed..b6f5ec8 100755
--- a/src/delta-ua/engine/SS_UPI.c
+++ b/src/upgrade-apply-deltafs/engine/SS_UPI.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/SS_UPI.h b/src/upgrade-apply-deltafs/engine/SS_UPI.h
similarity index 99%
rename from src/delta-ua/engine/SS_UPI.h
rename to src/upgrade-apply-deltafs/engine/SS_UPI.h
index 107a810..b9cb744 100755
--- a/src/delta-ua/engine/SS_UPI.h
+++ b/src/upgrade-apply-deltafs/engine/SS_UPI.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/fota_common.h b/src/upgrade-apply-deltafs/engine/fota_common.h
similarity index 99%
rename from src/delta-ua/engine/fota_common.h
rename to src/upgrade-apply-deltafs/engine/fota_common.h
index 607ae5f..38a6ec9 100755
--- a/src/delta-ua/engine/fota_common.h
+++ b/src/upgrade-apply-deltafs/engine/fota_common.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/fota_log.c b/src/upgrade-apply-deltafs/engine/fota_log.c
similarity index 99%
rename from src/delta-ua/engine/fota_log.c
rename to src/upgrade-apply-deltafs/engine/fota_log.c
index 0fb8285..93c42ed 100755
--- a/src/delta-ua/engine/fota_log.c
+++ b/src/upgrade-apply-deltafs/engine/fota_log.c
@@ -1,5 +1,5 @@
 /*
- * libtota
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/fota_log.h b/src/upgrade-apply-deltafs/engine/fota_log.h
similarity index 98%
rename from src/delta-ua/engine/fota_log.h
rename to src/upgrade-apply-deltafs/engine/fota_log.h
index f3e8b35..7e460c6 100755
--- a/src/delta-ua/engine/fota_log.h
+++ b/src/upgrade-apply-deltafs/engine/fota_log.h
@@ -1,5 +1,5 @@
 /*
- * libtota
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/fota_tar.c b/src/upgrade-apply-deltafs/engine/fota_tar.c
similarity index 99%
rename from src/delta-ua/engine/fota_tar.c
rename to src/upgrade-apply-deltafs/engine/fota_tar.c
index d0304f9..ff7233a 100755
--- a/src/delta-ua/engine/fota_tar.c
+++ b/src/upgrade-apply-deltafs/engine/fota_tar.c
@@ -1,5 +1,5 @@
 /*
- * libtota
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/fota_tar.h b/src/upgrade-apply-deltafs/engine/fota_tar.h
similarity index 97%
rename from src/delta-ua/engine/fota_tar.h
rename to src/upgrade-apply-deltafs/engine/fota_tar.h
index 6d141ef..a774836 100755
--- a/src/delta-ua/engine/fota_tar.h
+++ b/src/upgrade-apply-deltafs/engine/fota_tar.h
@@ -1,5 +1,5 @@
 /*
- * libtota
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/engine/ss_bspatch_common.c b/src/upgrade-apply-deltafs/engine/ss_bspatch_common.c
similarity index 100%
rename from src/delta-ua/engine/ss_bspatch_common.c
rename to src/upgrade-apply-deltafs/engine/ss_bspatch_common.c
diff --git a/src/delta-ua/engine/ss_bspatch_common.h b/src/upgrade-apply-deltafs/engine/ss_bspatch_common.h
similarity index 100%
rename from src/delta-ua/engine/ss_bspatch_common.h
rename to src/upgrade-apply-deltafs/engine/ss_bspatch_common.h
diff --git a/src/delta-ua/engine/ua_types.h b/src/upgrade-apply-deltafs/engine/ua_types.h
similarity index 98%
rename from src/delta-ua/engine/ua_types.h
rename to src/upgrade-apply-deltafs/engine/ua_types.h
index 5adb0ad..9d00a9d 100755
--- a/src/delta-ua/engine/ua_types.h
+++ b/src/upgrade-apply-deltafs/engine/ua_types.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/fota_cfg.c b/src/upgrade-apply-deltafs/fota_cfg.c
similarity index 97%
rename from src/delta-ua/fota_cfg.c
rename to src/upgrade-apply-deltafs/fota_cfg.c
index 033e558..803b37f 100755
--- a/src/delta-ua/fota_cfg.c
+++ b/src/upgrade-apply-deltafs/fota_cfg.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/fota_cfg.h b/src/upgrade-apply-deltafs/fota_cfg.h
similarity index 97%
rename from src/delta-ua/fota_cfg.h
rename to src/upgrade-apply-deltafs/fota_cfg.h
index e55d223..a72fb32 100755
--- a/src/delta-ua/fota_cfg.h
+++ b/src/upgrade-apply-deltafs/fota_cfg.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 -2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/fota_util.c b/src/upgrade-apply-deltafs/fota_util.c
similarity index 99%
rename from src/delta-ua/fota_util.c
rename to src/upgrade-apply-deltafs/fota_util.c
index a8552df..a4bb78c 100755
--- a/src/delta-ua/fota_util.c
+++ b/src/upgrade-apply-deltafs/fota_util.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/fota_util.h b/src/upgrade-apply-deltafs/fota_util.h
similarity index 97%
rename from src/delta-ua/fota_util.h
rename to src/upgrade-apply-deltafs/fota_util.h
index ae0e568..df1b9c9 100755
--- a/src/delta-ua/fota_util.h
+++ b/src/upgrade-apply-deltafs/fota_util.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
diff --git a/src/delta-ua/ua.c b/src/upgrade-apply-deltafs/ua.c
similarity index 98%
rename from src/delta-ua/ua.c
rename to src/upgrade-apply-deltafs/ua.c
index 479ccdf..55af7e3 100755
--- a/src/delta-ua/ua.c
+++ b/src/upgrade-apply-deltafs/ua.c
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
@@ -94,7 +94,7 @@ void print_usage(const char *msg)
 	if (msg) {
 		printf("%s\n", msg);
 	}
-	printf("print_usage: delta.ua --archive delta_dir --dest label --archive-file label.img\n"
+	printf("print_usage: upgrade-apply-deltafs --archive delta_dir --dest label --archive-file label.img\n"
 	"delta_dir: directory path where delta.tar file is located\n"
 	"label: label of the partition to be updated\n"
 	"label.img: name of the file inside of delta that is to be used during upgrade\n"
@@ -103,7 +103,7 @@ void print_usage(const char *msg)
 
 void print_error_code(int err)
 {
-	char msg[]="delta.ua error:";
+	char msg[]="upgrade-apply-deltafs error:";
 	switch (err) {
 	case UPI_CONFIG_ERROR:
 		printf("%s config error.\n", msg);
@@ -133,7 +133,7 @@ void print_error_code(int err)
 		printf("%s partition information error.\n", msg);
 		break;
 	default:
-		printf("delta.ua unable to determine error code: %d\n", err);
+		printf("upgrade-apply-deltafs unable to determine error code: %d\n", err);
 	}
 }
 
diff --git a/src/delta-ua/ua.h b/src/upgrade-apply-deltafs/ua.h
similarity index 98%
rename from src/delta-ua/ua.h
rename to src/upgrade-apply-deltafs/ua.h
index c5077fe..347159c 100755
--- a/src/delta-ua/ua.h
+++ b/src/upgrade-apply-deltafs/ua.h
@@ -1,5 +1,5 @@
 /*
- * delta-ua
+ * upgrade-apply-deltafs
  *
  * Copyright (c) 2017 - 2022 Samsung Electronics Co., Ltd.
  *
-- 
2.7.4