From d05b5cfae14bb0345b99afe7bce99f10f3b78f4c Mon Sep 17 00:00:00 2001 From: Rayllll Date: Thu, 14 Aug 2025 19:32:46 +0800 Subject: [PATCH 1/2] Signed-off-by: Rayllll revert code sign --- services/include/updater/updater_const.h | 1 + services/updater.cpp | 15 ++------------- services/updater_main.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/services/include/updater/updater_const.h b/services/include/updater/updater_const.h index 38cb92de..6f9176d7 100644 --- a/services/include/updater/updater_const.h +++ b/services/include/updater/updater_const.h @@ -31,6 +31,7 @@ constexpr const char *SYS_INSTALLER_LOG = "/data/updater/log/sys_installer.log"; 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 *SYS_INSTALLER_PATH = "/mnt/sys_installer"; constexpr const char *UPDATER_PATH = "/data/updater"; constexpr const char *UPDATER_LOCALE_FILE = "locale"; constexpr const char *UPDATER_RESULT_FILE = "updater_result"; diff --git a/services/updater.cpp b/services/updater.cpp index fc32733c..5fabf5b4 100644 --- a/services/updater.cpp +++ b/services/updater.cpp @@ -279,12 +279,6 @@ __attribute__((weak)) bool PreStartBinaryEntry([[maybe_unused]] const std::strin return true; } -__attribute__((weak)) bool EnableCodeSignForBinary([[maybe_unused]] const std::string &fullPath) -{ - LOG(INFO) << "no need to enable code sign for binary"; - return true; -} - float g_progressRatio = 1.0; void SetTotalProgressRatio(float ratio) @@ -421,7 +415,7 @@ UpdaterStatus DoInstallUpdaterBinfile(PkgManager::PkgManagerPtr pkgManager, Upda } g_tmpProgressValue = 0; - // 从bin文件开启进程 + // 从bin文件开启进? UpdaterStatus updateRet = StartUpdaterProc(pkgManager, upParams); if (updateRet != UPDATE_SUCCESS) { UPDATER_UI_INSTANCE.ShowUpdInfo(TR(UPD_INSTALL_FAIL)); @@ -728,11 +722,6 @@ UpdaterStatus StartUpdaterProc(PkgManager::PkgManagerPtr pkgManager, UpdaterPara #ifdef WITH_SELINUX Restorecon(fullPath.c_str()); #endif // WITH_SELINUX - if (!EnableCodeSignForBinary(fullPath)) { - LOG(ERROR) << "Failed to sign for binary"; - UPDATER_LAST_WORD(UPDATE_ERROR, "Failed to sign for binary"); - return UPDATE_ERROR; - } pid_t pid = fork(); if (pid < 0) { ERROR_CODE(CODE_FORK_FAIL); @@ -765,6 +754,6 @@ std::string GetWorkPath() return G_WORK_PATH; } - return std::string(UPDATER_PATH) + "/"; + return std::string(SYS_INSTALLER_PATH) + "/"; } } // namespace Updater diff --git a/services/updater_main.h b/services/updater_main.h index c8a430c9..bd1cc22f 100644 --- a/services/updater_main.h +++ b/services/updater_main.h @@ -94,7 +94,6 @@ UpdaterStatus NotifyActionResult(UpdaterParams &upParams, UpdaterStatus &status, const std::vector ¬ifyActionVec); UpdaterStatus UpdateSubPkg(UpdaterParams &upParams); void NotifyPreCheck(UpdaterStatus &status, UpdaterParams &upParams); -bool EnableCodeSignForBinary([[maybe_unused]] const std::string &fullPath); #ifdef __cplusplus #if __cplusplus } -- Gitee From 4550fe225cd03492ab78928ad8451d819da03876 Mon Sep 17 00:00:00 2001 From: Rayllll Date: Thu, 14 Aug 2025 11:34:54 +0000 Subject: [PATCH 2/2] update services/updater.cpp. Signed-off-by: Rayllll --- services/updater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/updater.cpp b/services/updater.cpp index 5fabf5b4..c8c00ae7 100644 --- a/services/updater.cpp +++ b/services/updater.cpp @@ -415,7 +415,7 @@ UpdaterStatus DoInstallUpdaterBinfile(PkgManager::PkgManagerPtr pkgManager, Upda } g_tmpProgressValue = 0; - // 从bin文件开启进? + // 从bin文件开启进程 UpdaterStatus updateRet = StartUpdaterProc(pkgManager, upParams); if (updateRet != UPDATE_SUCCESS) { UPDATER_UI_INSTANCE.ShowUpdInfo(TR(UPD_INSTALL_FAIL)); -- Gitee