From 2f4cdcebc3ebdac8b22d12d729fe4d1468867d5c Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 19 Sep 2024 07:59:12 +0000 Subject: [PATCH 01/11] update services/updater_utils.cpp. Signed-off-by: zhangcan42 --- services/updater_utils.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/updater_utils.cpp b/services/updater_utils.cpp index 5f722cc7..06dd6534 100755 --- a/services/updater_utils.cpp +++ b/services/updater_utils.cpp @@ -100,7 +100,8 @@ bool DeleteUpdaterPath(const std::string &path) if (currentName[0] == '.' || (currentName.compare("log") == 0) || (currentName.compare(UPDATER_RESULT_FILE) == 0) || (currentName.compare(UPDATER_LOCALE_FILE) == 0) || - (currentName.compare(MODULE_UPDATE_RESULT_FILE) == 0)) { + (currentName.compare(MODULE_UPDATE_RESULT_FILE) == 0) || + (currentName.compare(UPLOAD_LOG_TIME_FILE) == 0)) { continue; } if (sdcardTmp && currentName.find(SDCARD_PACKAGE_SUFFIX) != std::string::npos) { -- Gitee From 062b3f1b86b81e8b444bd2204bf86f926fca2605 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 19 Sep 2024 08:00:49 +0000 Subject: [PATCH 02/11] update services/include/updater/updater_const.h. Signed-off-by: zhangcan42 --- services/include/updater/updater_const.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/include/updater/updater_const.h b/services/include/updater/updater_const.h index 9466c8bd..26f9d7ad 100644 --- a/services/include/updater/updater_const.h +++ b/services/include/updater/updater_const.h @@ -44,6 +44,7 @@ constexpr const char *PREFIX_UFS_NODE = "/dev/block/sd"; constexpr const char *SDCARD_PACKAGE_SUFFIX = ".zip"; constexpr const char *POWEROFF = "shutdown"; constexpr const char *BOOTDEV_TYPE = "/proc/bootdevice/type"; +constexpr const char *UPLOAD_LOG_TIME_FILE = "upload_time"; // update mode constexpr const char *SDCARD_MODE = "sdcard_update"; -- Gitee From 159c276530a0c8baaec69b96c59edf8e4a2dd4bd Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 19 Sep 2024 08:15:25 +0000 Subject: [PATCH 03/11] update test/unittest/test_data/src/libcrypto.a. Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index 40f2a9eb..fec729b6 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,3 +1,6 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7c1deb011c28a135353ae9acccc981847a491092d07aa5fd712138bc1a00df2 -size 197 +LoadScript("test_function.us", 1); +LoadScript("test_logic.us", 3); +LoadScript("test_if.us", 1); +LoadScript("test_math.us", 1); +LoadScript("testscript.us", 1); +LoadScript("Verse-script.us", 1); \ No newline at end of file -- Gitee From 26eb7248ce0da0df5d8e944258a31565045962e6 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 19 Sep 2024 12:44:50 +0000 Subject: [PATCH 04/11] update test/unittest/test_data/src/libcrypto.a. Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index fec729b6..2bc570f1 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -3,4 +3,4 @@ LoadScript("test_logic.us", 3); LoadScript("test_if.us", 1); LoadScript("test_math.us", 1); LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); \ No newline at end of file +LoadScript("Verse-script.us", 1); -- Gitee From c27402cb29bce73c0eee11669af1558c41022072 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Thu, 19 Sep 2024 12:45:06 +0000 Subject: [PATCH 05/11] update test/unittest/test_data/src/libcrypto.a. Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index 2bc570f1..fec729b6 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -3,4 +3,4 @@ LoadScript("test_logic.us", 3); LoadScript("test_if.us", 1); LoadScript("test_math.us", 1); LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); +LoadScript("Verse-script.us", 1); \ No newline at end of file -- Gitee From 2a78b0dfc8146a8cac020fb327ba6586a570ffb6 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 20:13:26 +0800 Subject: [PATCH 06/11] fix Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index fec729b6..02c1d259 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,6 +1,3 @@ -LoadScript("test_function.us", 1); -LoadScript("test_logic.us", 3); -LoadScript("test_if.us", 1); -LoadScript("test_math.us", 1); -LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); \ No newline at end of file +version https://git-lfs.github.com/spec/v1 +oid sha256:603a633f61c4dfa72bb01f792d509169637030a1c6249acca3de74a643ce87ba +size 193 -- Gitee From 0ecdf326578ccad10f4780d37d5ac66b55264e4f Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 12:24:32 +0000 Subject: [PATCH 07/11] update test/unittest/test_data/src/libcrypto.a. Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index 02c1d259..fec729b6 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,3 +1,6 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:603a633f61c4dfa72bb01f792d509169637030a1c6249acca3de74a643ce87ba -size 193 +LoadScript("test_function.us", 1); +LoadScript("test_logic.us", 3); +LoadScript("test_if.us", 1); +LoadScript("test_math.us", 1); +LoadScript("testscript.us", 1); +LoadScript("Verse-script.us", 1); \ No newline at end of file -- Gitee From b03cc6bb477059674d6f09acb7a8cd4727963b58 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 20:44:38 +0800 Subject: [PATCH 08/11] fix Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index fec729b6..347a8506 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,6 +1,3 @@ -LoadScript("test_function.us", 1); -LoadScript("test_logic.us", 3); -LoadScript("test_if.us", 1); -LoadScript("test_math.us", 1); -LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); \ No newline at end of file +version https://git-lfs.github.com/spec/v1 +oid sha256:3ea9294d2782c5525d37949cbf0c5985ed02424973f8e3baab5aa85cfa6e7484 +size 192 -- Gitee From 8ff1e1e138556dcd809f41f592b052d8a8638ae3 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 12:49:14 +0000 Subject: [PATCH 09/11] update test/unittest/test_data/src/libcrypto.a. Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index 347a8506..fec729b6 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,3 +1,6 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ea9294d2782c5525d37949cbf0c5985ed02424973f8e3baab5aa85cfa6e7484 -size 192 +LoadScript("test_function.us", 1); +LoadScript("test_logic.us", 3); +LoadScript("test_if.us", 1); +LoadScript("test_math.us", 1); +LoadScript("testscript.us", 1); +LoadScript("Verse-script.us", 1); \ No newline at end of file -- Gitee From e95237247aff4dba48b871b4f22a9febec0dc1d8 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 20:51:22 +0800 Subject: [PATCH 10/11] test/unittest/test_data/src/libcrypto.a: convert to Git LFS --- test/unittest/test_data/src/libcrypto.a | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index fec729b6..347a8506 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,6 +1,3 @@ -LoadScript("test_function.us", 1); -LoadScript("test_logic.us", 3); -LoadScript("test_if.us", 1); -LoadScript("test_math.us", 1); -LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); \ No newline at end of file +version https://git-lfs.github.com/spec/v1 +oid sha256:3ea9294d2782c5525d37949cbf0c5985ed02424973f8e3baab5aa85cfa6e7484 +size 192 -- Gitee From b3dbd6462971a91f4373fa08826d670a066effd4 Mon Sep 17 00:00:00 2001 From: zhangcan42 Date: Mon, 23 Sep 2024 20:51:22 +0800 Subject: [PATCH 11/11] test/unittest/test_data/src/libcrypto.a: convert to Git LFS Signed-off-by: zhangcan42 --- test/unittest/test_data/src/libcrypto.a | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/unittest/test_data/src/libcrypto.a b/test/unittest/test_data/src/libcrypto.a index fec729b6..347a8506 100755 --- a/test/unittest/test_data/src/libcrypto.a +++ b/test/unittest/test_data/src/libcrypto.a @@ -1,6 +1,3 @@ -LoadScript("test_function.us", 1); -LoadScript("test_logic.us", 3); -LoadScript("test_if.us", 1); -LoadScript("test_math.us", 1); -LoadScript("testscript.us", 1); -LoadScript("Verse-script.us", 1); \ No newline at end of file +version https://git-lfs.github.com/spec/v1 +oid sha256:3ea9294d2782c5525d37949cbf0c5985ed02424973f8e3baab5aa85cfa6e7484 +size 192 -- Gitee