From b693176a9779f63ca9ce82b7dc348b743c68d7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Sat, 17 Aug 2024 09:52:14 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=93=9D=E5=8C=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 2 +- services/engine/etc/updater_sa.cfg | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 63191878..ede30843 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -35,7 +35,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat // 存放升级引擎数据库、缓存等文件的加密路径 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update"; -static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/dupdate_engine"; +static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service"; static const std::string DATABASES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; diff --git a/services/engine/etc/updater_sa.cfg b/services/engine/etc/updater_sa.cfg index de4271cc..2b85349a 100644 --- a/services/engine/etc/updater_sa.cfg +++ b/services/engine/etc/updater_sa.cfg @@ -3,12 +3,12 @@ "name" : "boot", "cmds" : [ "mkdir /data/service/el1/public/update 0751 update update", - "mkdir /data/service/el1/public/update/dupdate_engine 0700 update update", - "mkdir /data/service/el1/public/update/dupdate_engine/databases 0700 update update", - "mkdir /data/service/el1/public/update/dupdate_engine/preferences 0700 update update", - "mkdir /data/service/el1/public/update/dupdate_engine/files 0700 update update", - "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware 0700 update update", - "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware/changelogs 0700 update update", + "mkdir /data/service/el1/public/update/update_service 0700 update update", + "mkdir /data/service/el1/public/update/update_service/databases 0700 update update", + "mkdir /data/service/el1/public/update/update_service/preferences 0700 update update", + "mkdir /data/service/el1/public/update/update_service/files 0700 update update", + "mkdir /data/service/el1/public/update/update_service/files/firmware 0700 update update", + "mkdir /data/service/el1/public/update/update_service/files/firmware/changelogs 0700 update update", "mkdir /data/update 0770 update update", "mkdir /data/update/ota_package 0770 update update", "mkdir /data/update/ota_package/firmware 0770 update update", -- Gitee From 24d373fb49320dad364713a02d7610c360a136e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 19 Aug 2024 02:53:55 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=AA=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 2 +- services/engine/etc/updater_sa.cfg | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index ede30843..5fa4400d 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -36,7 +36,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat // 存放升级引擎数据库、缓存等文件的加密路径 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update"; static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service"; -static const std::string DATABASES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/databases"; +static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; diff --git a/services/engine/etc/updater_sa.cfg b/services/engine/etc/updater_sa.cfg index 2b85349a..8e4ccd9a 100644 --- a/services/engine/etc/updater_sa.cfg +++ b/services/engine/etc/updater_sa.cfg @@ -3,12 +3,14 @@ "name" : "boot", "cmds" : [ "mkdir /data/service/el1/public/update 0751 update update", + "mkdir /data/service/el1/public/update/dupdate_engine 0700 update update", + "mkdir /data/service/el1/public/update/dupdate_engine/databases 0700 update update", + "mkdir /data/service/el1/public/update/dupdate_engine/preferences 0700 update update", + "mkdir /data/service/el1/public/update/dupdate_engine/files 0700 update update", + "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware 0700 update update", + "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware/changelogs 0700 update update", "mkdir /data/service/el1/public/update/update_service 0700 update update", "mkdir /data/service/el1/public/update/update_service/databases 0700 update update", - "mkdir /data/service/el1/public/update/update_service/preferences 0700 update update", - "mkdir /data/service/el1/public/update/update_service/files 0700 update update", - "mkdir /data/service/el1/public/update/update_service/files/firmware 0700 update update", - "mkdir /data/service/el1/public/update/update_service/files/firmware/changelogs 0700 update update", "mkdir /data/update 0770 update update", "mkdir /data/update/ota_package 0770 update update", "mkdir /data/update/ota_package/firmware 0770 update update", -- Gitee From 4f202fd43c98decc9f126b9396dc6add291aaedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 19 Aug 2024 02:58:40 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=AA=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 5fa4400d..7f9748b5 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -35,7 +35,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat // 存放升级引擎数据库、缓存等文件的加密路径 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update"; -static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service"; +static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/dupdate_engine"; static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; -- Gitee From 22a7ca5603f67d55b32a3b660a47bb7f10886730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 19 Aug 2024 07:35:37 +0000 Subject: [PATCH 4/6] 111 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 7f9748b5..1934d109 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -39,7 +39,6 @@ static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_R static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; - // 存放ota升级包的非加密路径 static const std::string UPDATE_PACKAGE_ROOT_PATH = "/data/update"; static const std::string DUPDATE_ENGINE_PACKAGE_ROOT_PATH = UPDATE_PACKAGE_ROOT_PATH + "/ota_package"; -- Gitee From c4ab7c249763609d674653e792622828fe82958c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 19 Aug 2024 07:36:01 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 1934d109..7f9748b5 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -39,6 +39,7 @@ static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_R static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; + // 存放ota升级包的非加密路径 static const std::string UPDATE_PACKAGE_ROOT_PATH = "/data/update"; static const std::string DUPDATE_ENGINE_PACKAGE_ROOT_PATH = UPDATE_PACKAGE_ROOT_PATH + "/ota_package"; -- Gitee From 7b1d3f4ea1d9f02d5b6a3260cc413b77e890fd81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 19 Aug 2024 09:27:48 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=8A=A0'/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/common/include/constant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 7f9748b5..6df32e6d 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -36,7 +36,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat // 存放升级引擎数据库、缓存等文件的加密路径 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update"; static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/dupdate_engine"; -static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "update_service" + "/databases"; +static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; -- Gitee