Merge branch 'master' into release/v5.3

espressif · Aug 28, 2024 · 958f8b0 · 958f8b0
2 parents 807bddb + f488f41
commit 958f8b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/configs/pio_start.txt b/configs/pio_start.txt
@@ -47,7 +47,6 @@ if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
         LIBS=[
             "-lesp_zb_api_zczr",
             "-lesp_zb_cli_command",
-            "-lzboss_stack.zczr.trace",
             "-lzboss_stack.zczr",
             "-lzboss_port"
         ]
@@ -57,7 +56,6 @@ if "ZIGBEE_MODE_ED" in flatten_cppdefines:
         LIBS=[
             "-lesp_zb_api_ed",
             "-lesp_zb_cli_command",
-            "-lzboss_stack.ed.trace",
             "-lzboss_stack.ed",
             "-lzboss_port"
         ]

diff --git a/tools/install-arduino.sh b/tools/install-arduino.sh
@@ -41,8 +41,8 @@ fi
 
 if [ "$AR_BRANCH" ]; then
 	echo "AR_BRANCH='$AR_BRANCH'"
+	git -C "$AR_COMPS/arduino" fetch --all && \
 	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
-	git -C "$AR_COMPS/arduino" fetch && \
 	git -C "$AR_COMPS/arduino" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
@@ -17,6 +17,8 @@ if [ ! -d "$IDF_PATH" ]; then
 	idf_was_installed="1"
 fi
 
+git -C "$IDF_PATH" fetch --all --tags
+
 if [ "$IDF_TAG" ]; then
     git -C "$IDF_PATH" checkout "tags/$IDF_TAG"
     idf_was_installed="1"