From 954582db69fa0ab72bf7e0ea71c1d6fafa98e586 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 09:01:16 +0000 Subject: [PATCH 01/12] update interfaces/kits/packages/BUILD.gn. Signed-off-by: xieluyao --- interfaces/kits/packages/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/kits/packages/BUILD.gn b/interfaces/kits/packages/BUILD.gn index 79f33322..432ec678 100755 --- a/interfaces/kits/packages/BUILD.gn +++ b/interfaces/kits/packages/BUILD.gn @@ -79,6 +79,8 @@ ohos_static_library("libpackageExt") { "bounds_checking_function:libsec_static", "lz4:liblz4_static", "openssl:libcrypto_static", + "openssl:libssl_static", + "zlib:libz", ] subsystem_name = "updater" part_name = "updater" -- Gitee From 0bb39cb59c6dd7bdcbb5f68ca970ad8986c01b36 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 09:27:55 +0000 Subject: [PATCH 02/12] update services/flow_update/update_bin/BUILD.gn. Signed-off-by: xieluyao --- services/flow_update/update_bin/BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/flow_update/update_bin/BUILD.gn b/services/flow_update/update_bin/BUILD.gn index 83e3d6df..17c52942 100644 --- a/services/flow_update/update_bin/BUILD.gn +++ b/services/flow_update/update_bin/BUILD.gn @@ -15,6 +15,12 @@ import("//base/update/updater/updater_default_cfg.gni") import("//build/ohos.gni") updater_path = rebase_path("${updater_absolutely_path}", ".") + +config("libprocess_exported_headers"){ + visibility = [ ":*" ] + include_dirs = [ "${updater_path}/services/flow_update" ] +} + ohos_static_library("libBinFlowUpdate") { sources = [ "bin_flow_update.cpp", -- Gitee From 06e977a4be55dc4fe9430c0063e7f8e6c9ebdf99 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 09:29:19 +0000 Subject: [PATCH 03/12] update services/flow_update/update_bin/BUILD.gn. Signed-off-by: xieluyao --- services/flow_update/update_bin/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/flow_update/update_bin/BUILD.gn b/services/flow_update/update_bin/BUILD.gn index 17c52942..5d96dd35 100644 --- a/services/flow_update/update_bin/BUILD.gn +++ b/services/flow_update/update_bin/BUILD.gn @@ -44,6 +44,8 @@ ohos_static_library("libBinFlowUpdate") { "${updater_path}/services/script", "${updater_path}/utils/include", ] + + public_config = [ ":libprocess_exported_headers" ] deps = [ "${updater_path}/interfaces/kits/packages:libpackageExt", "${updater_path}/services/applypatch:libapplypatch", -- Gitee From bfd5bff2bee71f37547d43cdcebeb27a1dc5c1b3 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 09:32:58 +0000 Subject: [PATCH 04/12] update services/include/updater/updater_const.h. Signed-off-by: xieluyao --- 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 38cb92de..0d327718 100644 --- a/services/include/updater/updater_const.h +++ b/services/include/updater/updater_const.h @@ -32,6 +32,7 @@ constexpr const char *UPDATER_STAGE_LOG = "/data/updater/log/updater_stage_log"; constexpr const char *UPDATER_LOG_FILE = "updater_log"; constexpr const char *UPDATER_STAGE_FILE = "updater_stage_log"; constexpr const char *UPDATER_PATH = "/data/updater"; +constexpr const char *SYS_INSTALLER_PATH = "/mnt/sys_installer"; constexpr const char *UPDATER_LOCALE_FILE = "locale"; constexpr const char *UPDATER_RESULT_FILE = "updater_result"; constexpr const char *MODULE_UPDATE_RESULT_FILE = "module_update_result"; -- Gitee From f905998b3c3b7587d739f2613b30c5cf57f9944d Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 11:16:26 +0000 Subject: [PATCH 05/12] update services/package/BUILD.gn. Signed-off-by: xieluyao --- services/package/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn index e77a4707..1acddbbc 100644 --- a/services/package/BUILD.gn +++ b/services/package/BUILD.gn @@ -47,8 +47,10 @@ config("libupdaterpackage_exported_headers") { "${updater_path}/services/include/package", "${updater_path}/services/include", "${updater_path}/services/package", + "${updater_path}/services/package/pkg_algorithm", "${updater_path}/services/package/pkg_manager", "${updater_path}/services/package/pkg_verify", + "${updater_path}/services/package/pkg_package", "${updater_path}/services/include/script", "${updater_path}/interfaces/kits/include", ] -- Gitee From 9340525dc08dae42e3981facc7572400a4b24b98 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 11:25:26 +0000 Subject: [PATCH 06/12] update services/ptable_parse/ptable.cpp. Signed-off-by: xieluyao --- services/ptable_parse/ptable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/ptable_parse/ptable.cpp b/services/ptable_parse/ptable.cpp index 53c4920f..01d14aa4 100644 --- a/services/ptable_parse/ptable.cpp +++ b/services/ptable_parse/ptable.cpp @@ -78,6 +78,12 @@ bool Ptable::LoadPtnInfo(const std::vector &ptnInfo) return true; } +bool Ptable::CorrectBufByPtnList(unit8_t *imageBuf, unit64_t imageBufSize, const std::vector &srcInfo, + const std::vector &dstInfo) +{ + return false; +} + void Ptable::SetReservedSize(uint64_t reservedSize) { reservedSize_ = reservedSize; -- Gitee From 0ee406ae341319e1734b7243c2928cb15fc19b4c Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 11:47:23 +0000 Subject: [PATCH 07/12] update services/flow_update/update_bin/BUILD.gn. Signed-off-by: xieluyao --- services/flow_update/update_bin/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/flow_update/update_bin/BUILD.gn b/services/flow_update/update_bin/BUILD.gn index 5d96dd35..070123b1 100644 --- a/services/flow_update/update_bin/BUILD.gn +++ b/services/flow_update/update_bin/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") updater_path = rebase_path("${updater_absolutely_path}", ".") -config("libprocess_exported_headers"){ +config("libprocess_exported_headers") { visibility = [ ":*" ] include_dirs = [ "${updater_path}/services/flow_update" ] } @@ -45,7 +45,7 @@ ohos_static_library("libBinFlowUpdate") { "${updater_path}/utils/include", ] - public_config = [ ":libprocess_exported_headers" ] + public_configs = [ ":libprocess_exported_headers" ] deps = [ "${updater_path}/interfaces/kits/packages:libpackageExt", "${updater_path}/services/applypatch:libapplypatch", -- Gitee From 2479290369112239c3114d73b1c1e5a7991415d6 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 12:17:55 +0000 Subject: [PATCH 08/12] update services/ptable_parse/ptable.cpp. Signed-off-by: xieluyao --- services/ptable_parse/ptable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/ptable_parse/ptable.cpp b/services/ptable_parse/ptable.cpp index 01d14aa4..7b3fd606 100644 --- a/services/ptable_parse/ptable.cpp +++ b/services/ptable_parse/ptable.cpp @@ -78,7 +78,7 @@ bool Ptable::LoadPtnInfo(const std::vector &ptnInfo) return true; } -bool Ptable::CorrectBufByPtnList(unit8_t *imageBuf, unit64_t imageBufSize, const std::vector &srcInfo, +bool Ptable::CorrectBufByPtnList(unit8_t *imageBuf, unit64_t imgBufSize, const std::vector &srcInfo, const std::vector &dstInfo) { return false; -- Gitee From 0b65862efb3eed79cad48c14967856883f3c7b0a Mon Sep 17 00:00:00 2001 From: xieluyao Date: Thu, 14 Aug 2025 12:25:54 +0000 Subject: [PATCH 09/12] update services/ptable_parse/ptable.cpp. Signed-off-by: xieluyao --- services/ptable_parse/ptable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/ptable_parse/ptable.cpp b/services/ptable_parse/ptable.cpp index 7b3fd606..95531748 100644 --- a/services/ptable_parse/ptable.cpp +++ b/services/ptable_parse/ptable.cpp @@ -78,7 +78,7 @@ bool Ptable::LoadPtnInfo(const std::vector &ptnInfo) return true; } -bool Ptable::CorrectBufByPtnList(unit8_t *imageBuf, unit64_t imgBufSize, const std::vector &srcInfo, +bool Ptable::CorrectBufByPtnList(uint8_t *imageBuf, uint64_t imgBufSize, const std::vector &srcInfo, const std::vector &dstInfo) { return false; -- Gitee From 7771885a7449545261f51139f973707627d3c7d5 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Fri, 15 Aug 2025 03:33:30 +0000 Subject: [PATCH 10/12] update services/ptable_parse/ptable.cpp. Signed-off-by: xieluyao --- services/ptable_parse/ptable.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/ptable_parse/ptable.cpp b/services/ptable_parse/ptable.cpp index 95531748..53c4920f 100644 --- a/services/ptable_parse/ptable.cpp +++ b/services/ptable_parse/ptable.cpp @@ -78,12 +78,6 @@ bool Ptable::LoadPtnInfo(const std::vector &ptnInfo) return true; } -bool Ptable::CorrectBufByPtnList(uint8_t *imageBuf, uint64_t imgBufSize, const std::vector &srcInfo, - const std::vector &dstInfo) -{ - return false; -} - void Ptable::SetReservedSize(uint64_t reservedSize) { reservedSize_ = reservedSize; -- Gitee From a2617f05e403b99bd3a199dba1c9712a3fad431f Mon Sep 17 00:00:00 2001 From: xieluyao Date: Fri, 15 Aug 2025 06:10:32 +0000 Subject: [PATCH 11/12] update services/include/updater/updater_const.h. Signed-off-by: xieluyao --- services/include/updater/updater_const.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/include/updater/updater_const.h b/services/include/updater/updater_const.h index 0d327718..38cb92de 100644 --- a/services/include/updater/updater_const.h +++ b/services/include/updater/updater_const.h @@ -32,7 +32,6 @@ constexpr const char *UPDATER_STAGE_LOG = "/data/updater/log/updater_stage_log"; constexpr const char *UPDATER_LOG_FILE = "updater_log"; constexpr const char *UPDATER_STAGE_FILE = "updater_stage_log"; constexpr const char *UPDATER_PATH = "/data/updater"; -constexpr const char *SYS_INSTALLER_PATH = "/mnt/sys_installer"; constexpr const char *UPDATER_LOCALE_FILE = "locale"; constexpr const char *UPDATER_RESULT_FILE = "updater_result"; constexpr const char *MODULE_UPDATE_RESULT_FILE = "module_update_result"; -- Gitee From 07964b2eb83e8436224273a655c27c9c20892dd0 Mon Sep 17 00:00:00 2001 From: xieluyao Date: Mon, 18 Aug 2025 02:44:35 +0000 Subject: [PATCH 12/12] update interfaces/kits/packages/BUILD.gn. Signed-off-by: xieluyao --- interfaces/kits/packages/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/kits/packages/BUILD.gn b/interfaces/kits/packages/BUILD.gn index 432ec678..df5576dd 100755 --- a/interfaces/kits/packages/BUILD.gn +++ b/interfaces/kits/packages/BUILD.gn @@ -80,7 +80,6 @@ ohos_static_library("libpackageExt") { "lz4:liblz4_static", "openssl:libcrypto_static", "openssl:libssl_static", - "zlib:libz", ] subsystem_name = "updater" part_name = "updater" -- Gitee