From 5876294d66333e8d110ee4a67624ed6596cb65a6 Mon Sep 17 00:00:00 2001
From: "snickersun@163.com"
 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Date: Mon, 6 May 2024 11:24:03 +0000
Subject: [PATCH] Merge #130 into xts_origin from refs/changes/130/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

优化ota制作脚本，制作ota包时可自动添加附加资源文件。

* refs/changes/130/head: (1 commits squashed)

  - 优化ota制作脚本，制作ota包时可自动添加附加资源文件。

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/130
---
 gen_fs_otapkg.sh | 10 +++++-----
 mkota.sh         |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gen_fs_otapkg.sh b/gen_fs_otapkg.sh
index d1fdf76d4..e6e032bfb 100644
--- a/gen_fs_otapkg.sh
+++ b/gen_fs_otapkg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# set -ex
+#set -ex
 NEWVERSION=HEAD
 OLDVERSION=HEAD
 DATE=$(date  +%Y%m%d.%H%M%S)
@@ -33,7 +33,7 @@ list_rename_file_source_name()
 version1=$1
 version2=$2
 folder=$3
-git diff -z --diff-filter=R --name-status $version1 $version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
+git diff -z --diff-filter=R --name-status $version1...$version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
 if [ "$x" = "1" ] 
 then
  echo \"$file\"\ 
@@ -52,7 +52,7 @@ list_rename_file_target_name()
 version1=$1
 version2=$2
 folder=$3
-git diff -z --diff-filter=R --name-status $version1 $version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
+git diff -z --diff-filter=R --name-status $version1...$version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
 if [ "$x" = "2" ] 
 then
  echo \"$file\"\ 
@@ -72,7 +72,7 @@ list_added_and_modified_file_name()
 version1=$1
 version2=$2
 folder=$3
-git diff -z --diff-filter=ACM --name-only $version1 $version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
+git diff -z --diff-filter=ACM --name-only $version1...$version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
 echo \"$file\"\ 
 done' sh| awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\/fs\//,"") ;print $0 }'
 
@@ -82,7 +82,7 @@ list_deleted_file_name()
 version1=$1
 version2=$2
 folder=$3
-git diff -z --diff-filter=D --name-only $version1 $version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
+git diff -z --diff-filter=D --name-only $version1...$version2 $folder |xargs -0 sh -c -a 'x=0; for file; do 
 echo \"$file\"\ 
 done' sh | awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\/fs\//,"") ;print $0 }'
 
diff --git a/mkota.sh b/mkota.sh
index a9beba8db..a66485370 100644
--- a/mkota.sh
+++ b/mkota.sh
@@ -46,10 +46,18 @@ if [ -e "$RES_DIR/diff/deletedfiles.txt" ]; then
 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/
 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
 fi
-- 
2.17.1