From ca2f2f7242183d98d74a803a72a0287f384e2a43 Mon Sep 17 00:00:00 2001
From: longwei <longwei27@huawei.com>
Date: Fri, 9 Sep 2022 17:35:33 +0800
Subject: [PATCH 1/2] delete targetbundleList

Signed-off-by: longwei <longwei27@huawei.com>
Change-Id: Ie8e3f215449b9fbd3583ceb128693dcfde50a559
---
 modulecheck/app.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modulecheck/app.json b/modulecheck/app.json
index cefa8ec5..5dcd461f 100644
--- a/modulecheck/app.json
+++ b/modulecheck/app.json
@@ -43,7 +43,6 @@
           "singleton",
           "userDataClearable",
           "accessible",
-          "targetBundleList",
           "default",
           "tablet",
           "tv",
@@ -170,14 +169,6 @@
           "type": "boolean",
           "default": false
         },
-        "targetBundleList": {
-          "description": "This tag specifies the list of services that can be installed without the application. The list contains the bundle name of each service. A maximum of five bundle names can be configured. This label is a string array type and can be defaulted.",
-          "type": "array",
-          "maxItems": 5,
-          "items": {
-            "type": "string"
-          }
-        },
         "default": {
           "description": "The configuration in the default tag is applicable to all devices. If the configuration is different for other device types, you need to configure the configuration under the configuration tag of the device type.",
           "type": "object",
-- 
Gitee


From b2c8f4f5e2b1f83a45286556a8cdb36cbd221222 Mon Sep 17 00:00:00 2001
From: longwei <longwei27@huawei.com>
Date: Tue, 13 Sep 2022 09:46:49 +0800
Subject: [PATCH 2/2] fix compile failed for docker

Signed-off-by: longwei <longwei27@huawei.com>
Change-Id: I007d8d80b6113fce81f918049ee715792a8e1a06
---
 packingTool.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packingTool.sh b/packingTool.sh
index 48127eaf..05acee27 100755
--- a/packingTool.sh
+++ b/packingTool.sh
@@ -113,6 +113,12 @@ eval ${product_pack_jar_command}
 
 # merge app_packing_tool.jar and fastjson
 temp_dir="$root_path/jar/temp"
+if [ -d "$temp_dir" ]
+    then
+        rm -rf $temp_dir
+    else
+        echo "$temp_dir not exit"
+fi
 mkdir $temp_dir
 cp $pack_jar_path "$temp_dir/$pack_jar_file"
 cp $fastjson_jar_path "$temp_dir/$fastjson_jar_file"
@@ -129,7 +135,7 @@ merge_pack_fast_jar_command="jar -cvfm $pack_jar_file $manifest_path -C $temp_di
 eval $merge_pack_fast_jar_command
 if [ -d "$temp_dir" ]
     then
-        rm -r $temp_dir
+        rm -rf $temp_dir
     else
         echo "$temp_dir not exit"
 fi
-- 
Gitee