Rename upg-verifier to img-verifier

- Verifier is no more only for TOTA
  - System-recovery also use it

Change-Id: I2f188c6bb1782507581ac8efddff4e5313e47099
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c637f99..27aa88b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,4 +66,4 @@ TARGET_LINK_LIBRARIES(${EXECNAME} ${pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${EXECNAME} DESTINATION ${BINDIR})
 
-ADD_SUBDIRECTORY(upg-verifier)
+ADD_SUBDIRECTORY(img-verifier)

diff --git a/upg-verifier/CMakeLists.txt b/img-verifier/CMakeLists.txt
similarity index 97%
rename from upg-verifier/CMakeLists.txt
rename to img-verifier/CMakeLists.txt
index 42b4abc..4336f3c 100755 (executable)
--- a/upg-verifier/CMakeLists.txt
+++ b/img-verifier/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_DEFINITIONS("-DTOTA_CA_DIR=\"${TOTA_CA_DIR}\"")
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(SBINDIR "${PREFIX}/sbin")
-SET(VERIFIER "upg-verifier")
+SET(VERIFIER "img-verifier")
 SET(VERIFIER_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(VERIFIER_SRCS

diff --git a/upg-verifier/upg-verifier.c b/img-verifier/img-verifier.c
similarity index 98%
rename from upg-verifier/upg-verifier.c
rename to img-verifier/img-verifier.c
index 23e328e..af12e68 100644 (file)
--- a/upg-verifier/upg-verifier.c
+++ b/img-verifier/img-verifier.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "upg-verifier.h"
+#include "img-verifier.h"
 
 /**
  * You must install CA_FILE in the RO section
@@ -230,14 +230,14 @@ int main(int argc, char *argv[])
 #ifdef LOG_FILE
        _CLEANUP_CLOSE_ int log_fd;
 
-       log_fd = open("/opt/var/log/last_uv.log", O_WRONLY | O_CREAT, 0644);
+       log_fd = open("/opt/var/log/last_iv.log", O_WRONLY | O_CREAT, 0644);
        ASSERT_RETV(log_fd != -1, errno, "Failed to open log file fd : %m");
 
        ret = dup2(log_fd, STDOUT_FILENO);
        ASSERT_RETV(ret != -1, errno, "Failed to duplicate fd : %m");
 #endif
 
-       _I("Start to verify upg");
+       _I("Start to verify image");
 
        ret = check_argument(argc, argv);
        ASSERT_RETV(ret == SUCCEED, EINVAL, "Failed to check argument (%d)", ret);
@@ -282,6 +282,6 @@ int main(int argc, char *argv[])
 
        free_data(SUCCEED);
 
-       _I("Succeed to verify upg!");
+       _I("Succeed to verify image!");
        return SUCCEED;
 }

diff --git a/upg-verifier/upg-verifier.h b/img-verifier/img-verifier.h
similarity index 80%
rename from upg-verifier/upg-verifier.h
rename to img-verifier/img-verifier.h
index 0507e23..ae60de1 100644 (file)
--- a/upg-verifier/upg-verifier.h
+++ b/img-verifier/img-verifier.h
@@ -1,5 +1,5 @@
-#ifndef __UPG_VERIFIER_H__
-#define __UPG_VERIFIER_H__
+#ifndef __IMG_VERIFIER_H__
+#define __IMG_VERIFIER_H__
 
 #include <unistd.h>
 
@@ -8,7 +8,7 @@
 
 #define LOG_VERBOSE
 
-#define _L(lvl, fmt, arg...) printf("UV/" lvl fmt "\n", ##arg)
+#define _L(lvl, fmt, arg...) printf("IV/" lvl fmt "\n", ##arg)
 
 #ifdef LOG_VERBOSE
 #define _D(fmt, arg...) _L("DEBUG ", fmt, ##arg)
@@ -38,11 +38,11 @@ static void close_fd(int *fd)
 
 #define _CLEANUP_CLOSE_ __attribute__((__cleanup__(close_fd)))
 
-#define MAGIC_NUMBER "TOTA_SIGNED_V1"
+#define MAGIC_NUMBER "IMG_SIGNED_V1"
 #define MAGIC_NUMBER_SIZE (sizeof(MAGIC_NUMBER) - 1)
 
 /**
- * This structure is same with TOTA signed file.
+ * This structure is same with signed image.
  * So, please sync it with signer.
  */
 struct signed_file {
@@ -57,4 +57,4 @@ struct signed_file {
        unsigned char magic_number[MAGIC_NUMBER_SIZE];
 };
 
-#endif /* __UPG_VERIFIER_H__ */
+#endif /* __IMG_VERIFIER_H__ */

diff --git a/packaging/tota-ua.spec b/packaging/tota-ua.spec
index a998e18..7137a24 100755 (executable)
--- a/packaging/tota-ua.spec
+++ b/packaging/tota-ua.spec
@@ -65,5 +65,5 @@ mkdir -p %{buildroot}%{tota_ca_dir}
 %{_bindir}/delta.ua
 %{_bindir}/upgrade-trigger.sh
 %attr(700,-,-) %{tota_ua_list_dir}/40-tota-ua.list
-%{_sbindir}/upg-verifier
+%{_sbindir}/img-verifier
 %attr(755,root,root) %{tota_ca_dir}

diff --git a/scripts/40-tota-ua.list.in b/scripts/40-tota-ua.list.in
index ed6acf2..c2fe817 100755 (executable)
--- a/scripts/40-tota-ua.list.in
+++ b/scripts/40-tota-ua.list.in
@@ -3,5 +3,5 @@ WITHLIBS="
 @TOTA_UA_LIB_DIR@/libcrypto.so.1.1
 @TOTA_UA_LIB_DIR@/libtota.so.1.0.0
 /usr/bin/delta.ua
-/usr/sbin/upg-verifier
+/usr/sbin/img-verifier
 "

diff --git a/scripts/upgrade-trigger.sh b/scripts/upgrade-trigger.sh
index cc130b9..d53363c 100644 (file)
--- a/scripts/upgrade-trigger.sh
+++ b/scripts/upgrade-trigger.sh
@@ -5,7 +5,7 @@ STATUS_DIR="/opt/data/update"
 VERSION_FILE="/opt/etc/version"
 DOWNLOAD_DELTA=$1
 DELTA_TAR="$FOTA_DIR/delta.tar"
-UPG_VERIFIER="/usr/sbin/upg-verifier"
+IMG_VERIFIER="/usr/sbin/img-verifier"
 
 flash_pre_image() {
        echo "Flash images for update..."
@@ -96,9 +96,9 @@ echo "Copy delta.tar..."
 sync
 
 # Verify delta.tar
-if [ -e "$UPG_VERIFIER" ]; then
+if [ -e "$IMG_VERIFIER" ]; then
        echo "Package verifier is found. Verify $DELTA_TAR"
-       $UPG_VERIFIER $DELTA_TAR
+       $IMG_VERIFIER $DELTA_TAR
        if [ $? -ne 0 ]; then
                echo "Update package verification FAILED..."
                echo 5 > "$STATUS_DIR"/result