From: luozheng <1732036298@qq.com> Date: Wed, 17 Apr 2024 12:45:02 +0000 (+0800) Subject: 1.更改路径/user/update.fwpkg为"/update/update.fwpkg" X-Git-Tag: release_V1.2.70_20241020_135402~1162^2~15 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=50934dcb1e4d50945380909020055fef4cc19d47;p=mirrors%2FFD230.git 1.更改路径/user/update.fwpkg为"/update/update.fwpkg" 2.关闭build_brandy_update.py 的资源升级 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp index 89b506d71..fd5a50755 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp @@ -26,12 +26,12 @@ namespace OHOS // osThreadAttr_t g_alipay_attr = { // "alipay_task", 0, NULL, 0, NULL, ALIPAT_MSG_STACK_SIZE, TASK_PRIORITY_ALIPAY_APP, 0, 0 // }; - static char *Path= "/user/ota_start_3.json"; + static char *Path= "/update/ota_start_3.json"; static httpc_connection_t settings = {0}; static uint8_t uri[256] ={0};// (uint8_t*) //"http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver=V1.1_20240316_115535&imei=864430010001091"; - static char *Path_ota_package= "/user/update.fwpkg"; + static char *Path_ota_package= "/update/update.fwpkg"; static uint8_t uri_ota_package[124] ={0}; //#define UP_TEST static void upgrade_task(void *arg) diff --git a/code/sdk/build/config/target_config/brandy/build_brandy_update.py b/code/sdk/build/config/target_config/brandy/build_brandy_update.py index 46a1b1a65..109b9ce48 100755 --- a/code/sdk/build/config/target_config/brandy/build_brandy_update.py +++ b/code/sdk/build/config/target_config/brandy/build_brandy_update.py @@ -86,20 +86,20 @@ def get_new_image(info): # image_list.append("=".join([info.nv_bin, "nv"])) # 资源文件 - info.res_delfile = [] + # info.res_delfile = [] # 多个文件删除例子 # info.res_delfile = ["/user/userdata/ConfigModel.json","/user/res/APPLIST_COMPASS_IMAGE.bin"] - info.res_rmdir = [] + # info.res_rmdir = [] # 删除路径例子 # info.res_rmdir = ["/user/res/dials"] - if os.path.exists(info.res_dir) : - result = res_pack(info.res_dir, info.res_index, info.res_data,info.res_delfile,info.res_rmdir) - if not result: - sys.exit("[ERROR] resource file pack failed!!!") - image_list.append("=".join([info.res_index, "res_index"])) - image_list.append("=".join([info.res_data, "res_data"])) + # if os.path.exists(info.res_dir) : + # result = res_pack(info.res_dir, info.res_index, info.res_data,info.res_delfile,info.res_rmdir) + # if not result: + # sys.exit("[ERROR] resource file pack failed!!!") + # image_list.append("=".join([info.res_index, "res_index"])) + # image_list.append("=".join([info.res_data, "res_data"])) # 镜像签名 # image_list.append("=".join([info.ssb_sign, "ssb_sign"])) diff --git a/code/sdk/middleware/chips/brandy/update/include/upg_common_porting.h b/code/sdk/middleware/chips/brandy/update/include/upg_common_porting.h index a7ae146bf..11a640df6 100755 --- a/code/sdk/middleware/chips/brandy/update/include/upg_common_porting.h +++ b/code/sdk/middleware/chips/brandy/update/include/upg_common_porting.h @@ -16,13 +16,13 @@ extern "C" { #endif // #if MEMORY_MINI -#define UPG_FILE_PATH "/user/" -#define UPG_RES_INDEX_PATH "/user/res_index.bin" -#define UPG_FILE_NAME "/user/update.fwpkg" +// #define UPG_FILE_PATH "/user/" +// #define UPG_RES_INDEX_PATH "/user/res_index.bin" +// #define UPG_FILE_NAME "/user/update.fwpkg" // #else -// #define UPG_FILE_PATH "/update/" -// #define UPG_RES_INDEX_PATH "/update/res_index.bin" -// #define UPG_FILE_NAME "/update/update.fwpkg" +#define UPG_FILE_PATH "/update/" +#define UPG_RES_INDEX_PATH "/update/res_index.bin" +#define UPG_FILE_NAME "/update/update.fwpkg" // #endif #define UPG_FLASH_SIZE (FLASH_MAX_END - FLASH_START)