From 2448c419a3a8e47a84a280d25401e8dadba148bb Mon Sep 17 00:00:00 2001 From: "snickersun@163.com" Date: Fri, 28 Jun 2024 09:31:47 +0000 Subject: [PATCH] Merge #403 into sdk602patch0521 from refs/changes/403/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from snickersun@163.com * refs/changes/403/head: (3 commits squashed) - 更新modem新固件，添加电信入库新需求，pyVer版本增加到PY_SRV_V10。 - 修复mkota.sh 添加额外资源文件路径处理错误问题。 - Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: snickersun@163.com Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/403 --- ...01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718.zip | 3 +++ .../slip/cat1Service/pyscript/cat1Service.py | 2 +- ...01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip | 0 mkota.sh | 14 ++++---------- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718.zip rename {cat1modem => code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img}/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip (100%) diff --git a/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718.zip b/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718.zip new file mode 100644 index 000000000..87f94b8ff --- /dev/null +++ b/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dccf3700d78bc808651e6732db2e9b3803a187686519067500621f69e9384563 +size 11632487 diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py index 87e4bb633..dab18dc99 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py +++ b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py @@ -73,7 +73,7 @@ sms.setCallback(msg_cb)#sms注册回调 CAT1_SERVICE_HEAD = 'FE' #固定head PROJECT_NAME = "Cat1SlipUDPService" -PROJECT_VERSION = "PY_SRV_V9" +PROJECT_VERSION = "PY_SRV_V10" CONFIG_JSON="/usr/system_config.json" CURRENT_APP_TYPE="pysrv" diff --git a/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip similarity index 100% rename from cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip rename to code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240614-1855.zip diff --git a/mkota.sh b/mkota.sh index 9e148c8f6..9ecf96e21 100755 --- a/mkota.sh +++ b/mkota.sh @@ -50,26 +50,20 @@ cp -r $RES_DIR/fs code/sdk/output/brandy/TestOTA/res_file fi if [ -e "$RES_DIR/diff/deletedfiles.txt" ]; then +echo cp -f $RES_DIR/diff/deletedfiles.txt code/sdk/output/brandy/TestOTA/delfiles cp -f $RES_DIR/diff/deletedfiles.txt code/sdk/output/brandy/TestOTA/delfiles fi -if [ -d "code/sdk/output/brandy/TestOTA/oldsoftware/additional_fs/fs" ]; then -cp -rf code/sdk/output/brandy/TestOTA/oldsoftware/additional_fs/fs/* code/sdk/output/brandy/TestOTA/res_file/ -fi - if [ -d "$ADDITIONAL_RES_DIR/fs" ]; then -cp -rf $ADDITIONAL_RES_DIR/fs/* code/sdk/output/brandy/TestOTA/res_file/ -find $ADDITIONAL_RES_DIR/fs/ --type f |touch +echo cp -rf $ADDITIONAL_RES_DIR/fs/ code/sdk/output/brandy/TestOTA/res_file/ +cp -rf $ADDITIONAL_RES_DIR/fs/ code/sdk/output/brandy/TestOTA/res_file/ else echo $ADDITIONAL_RES_DIR/fs not exist, you can put additional resource file to there. fi -if [ -e "code/sdk/output/brandy/TestOTA/oldsoftware/additional_fs/delfiles" ]; then -cat code/sdk/output/brandy/TestOTA/oldsoftware/additional_fs/delfiles >> code/sdk/output/brandy/TestOTA/delfiles -fi - if [ -e "$ADDITIONAL_RES_DIR/delfiles" ]; then cat $ADDITIONAL_RES_DIR/delfiles >> code/sdk/output/brandy/TestOTA/delfiles +else echo $ADDITIONAL_RES_DIR/delfiles not exist, you can put filelist to this file , for adding them to del list in fota file. fi -- 2.17.1