OTA升级脚本修改

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 2644714..d80e501 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/build_brandy_update.py
+++ b/code/sdk/build/config/target_config/brandy/build_brandy_update.py
@@ -31,7 +31,7 @@ class upg_base_info:
         # 产品升级配置文件
         self.fota_cfg = os.path.join(self.root_path, "build", "config", "target_config", "brandy", "fota", "fota.cfg")
         # 产品镜像输出路径
-        self.output = os.path.join(self.root_path, "output", "brandy")
+        self.output = os.path.join(self.root_path, "output", "brandy","TestOTA")
         # 产品升级镜像包输出路径
         self.upg_output = os.path.join(self.output, "upgrade")
         # 产品升级制作临时文件输出路径
@@ -39,20 +39,20 @@ class upg_base_info:
 
         # 产品镜像路径 (此处路径仅为参考，需要根据实际使用的target修改)
         # 以下bt、dsp_main、dsp_overlay的路经并不存在，需要根据实际修改
-        self.ssb_bin         = os.path.join(self.output, "acore", "brandy-ssb", "ssb.bin")
-        self.recovery_bin    = os.path.join(self.output, "acore", "brandy-target1-r", "recovery.bin")
-        self.app_bin         = os.path.join(self.output, "acore", "brandy-target1", "application.bin")
-        self.bt_bin          = os.path.join(self.output, "bt_core", "bt.bin")
-        self.dsp_main_bin    = os.path.join(self.output, "dsp", "dsp_main.bin")
-        self.dsp_overlay_bin = os.path.join(self.output, "dsp", "dsp_overlay.bin")
-        self.nv_bin          = os.path.join(self.output, "nv_bin", "brandy_all_nv.bin")
+        self.ssb_bin         = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "ssb.bin")
+        self.recovery_bin    = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "recovery.bin")
+        self.app_bin         = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "application.bin")
+        self.bt_bin          = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "bt.bin")
+        self.dsp_main_bin    = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "dsp_main.bin")
+        self.dsp_overlay_bin = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "dsp_overlay.bin")
+        self.nv_bin          = os.path.join(self.output, "newsoftware", "pack_brandy_native_js", "brandy_all_nv.bin")
         # 产品镜像签名路径 (此处路径仅为参考，需要根据实际使用的target修改)
-        self.ssb_sign         = os.path.join(self.output, "acore", "brandy-ssb", "ssb_sign.bin")
-        self.recovery_sign    = os.path.join(self.output, "acore", "brandy-target1-r", "recovery_sign.bin")
-        self.app_sign         = os.path.join(self.output, "acore", "brandy-target1", "application_sign.bin")
-        self.bt_sign          = os.path.join(self.output, "bt_core", "bt_sign.bin")
-        self.dsp_main_sign    = os.path.join(self.output, "dsp", "dsp_main_sign.bin")
-        self.dsp_overlay_sign = os.path.join(self.output, "dsp", "dsp_overlay_sign.bin")
+        self.ssb_sign         = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign","ssb_sign.bin")
+        self.recovery_sign    = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign" ,"recovery_sign.bin")
+        self.app_sign         = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign","application_sign.bin")
+        self.bt_sign          = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign","bt_sign.bin")
+        self.dsp_main_sign    = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign", "dsp_main_sign.bin")
+        self.dsp_overlay_sign = os.path.join(self.output, "newsoftware", "pack_brandy_native_js","sign" ,"dsp_overlay_sign.bin")
 
         # 资源文件路径，根据需要自行修改添加
         self.res_dir          = os.path.join(self.output, "res_file")
@@ -60,25 +60,25 @@ class upg_base_info:
         self.res_data         = os.path.join(self.output, "res_data.bin")
 
         # 差分升级时，以下路径配置为上一个版本的镜像路径 (此处路径仅为参考，需要根据实际使用的target修改)
-        self.app_old_bin         = os.path.join(self.output, "old_version", "application.bin")
-        self.bt_old_bin          = os.path.join(self.output, "old_version", "bt.bin")
-        self.dsp_main_old_bin    = os.path.join(self.output, "old_version", "dsp_main.bin")
-        self.dsp_overlay_old_bin = os.path.join(self.output, "old_version", "dsp_overlay.bin")
+        self.app_old_bin         = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","application.bin")
+        self.bt_old_bin          = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","bt.bin")
+        self.dsp_main_old_bin    = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","dsp_main.bin")
+        self.dsp_overlay_old_bin = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","dsp_overlay.bin")
         # 旧产品镜像签名路径 (此处路径仅为参考，需要根据实际使用的target修改)
-        self.app_old_sign         = os.path.join(self.output, "old_version", "application_sign.bin")
-        self.bt_old_sign          = os.path.join(self.output, "old_version", "bt_sign.bin")
-        self.dsp_main_old_sign    = os.path.join(self.output, "old_version", "dsp_main_sign.bin")
-        self.dsp_overlay_old_sign = os.path.join(self.output, "old_version", "dsp_overlay_sign.bin")
+        self.app_old_sign         = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","sign","application_sign.bin")
+        self.bt_old_sign          = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","sign","bt_sign.bin")
+        self.dsp_main_old_sign    = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","sign","dsp_main_sign.bin")
+        self.dsp_overlay_old_sign = os.path.join(self.output, "oldsoftware", "pack_brandy_native_js","sign","dsp_overlay_sign.bin")
 
 def get_new_image(info):
     # 要升级的image列表，需根据升级的实际情况进行增删
     image_list = []
-    image_list.append("=".join([info.ssb_bin,          "ssb"]))
-    image_list.append("=".join([info.recovery_bin,     "recovery"]))
+    #image_list.append("=".join([info.ssb_bin,          "ssb"]))
+    #image_list.append("=".join([info.recovery_bin,     "recovery"]))
     image_list.append("=".join([info.app_bin,          "application"]))
-    # image_list.append("=".join([info.bt_bin,           "bt"]))
-    # image_list.append("=".join([info.dsp_main_bin,     "dsp_main"]))
-    # image_list.append("=".join([info.dsp_overlay_bin,  "dsp_overlay"]))
+    #image_list.append("=".join([info.bt_bin,           "bt"]))
+    #image_list.append("=".join([info.dsp_main_bin,     "dsp_main"]))
+    #image_list.append("=".join([info.dsp_overlay_bin,  "dsp_overlay"]))
     # image_list.append("=".join([info.nv_bin,           "nv"]))
 
     # 资源文件
@@ -103,10 +103,10 @@ def get_new_image(info):
 def get_old_image(info):
     # 要进行差分升级的image的旧版本镜像列表
     image_list = []
-    # image_list.append("=".join([info.app_old_bin,          "application"]))
-    # image_list.append("=".join([info.bt_old_bin,           "bt"]))
-    # image_list.append("=".join([info.dsp_main_old_bin,     "dsp_main"]))
-    # image_list.append("=".join([info.dsp_overlay_old_bin,  "dsp_overlay"]))
+    image_list.append("=".join([info.app_old_bin,          "application"]))
+    #image_list.append("=".join([info.bt_old_bin,           "bt"]))
+    #image_list.append("=".join([info.dsp_main_old_bin,     "dsp_main"]))
+    #image_list.append("=".join([info.dsp_overlay_old_bin,  "dsp_overlay"]))
 
     # image_list.append("=".join([info.app_old_sign,         "application_sign"]))
     # image_list.append("=".join([info.bt_old_sign,          "bt_sign"]))
@@ -129,3 +129,4 @@ if __name__ == '__main__':
     conf.output_dir      = info.upg_output
     conf.type            = 0
     begin(conf)
+