From c1301c61451ee48f30cf695643826bd96d41d4d1 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 27 Nov 2023 11:54:56 +0100
Subject: [PATCH] build: bypass build issues

---
 components/fatfs/test_apps/.build-test-rules.yml          | 3 +--
 .../cmake/import_prebuilt/main/project_include.cmake      | 8 ++++++++
 examples/protocols/.build-test-rules.yml                  | 3 +--
 examples/protocols/sockets/tcp_client/README.md           | 4 ++--
 examples/storage/littlefs/main/idf_component.yml          | 5 +----
 examples/system/.build-test-rules.yml                     | 3 +++
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/components/fatfs/test_apps/.build-test-rules.yml b/components/fatfs/test_apps/.build-test-rules.yml
index 552ed42304..15288644e4 100644
--- a/components/fatfs/test_apps/.build-test-rules.yml
+++ b/components/fatfs/test_apps/.build-test-rules.yml
@@ -15,14 +15,13 @@ components/fatfs/test_apps/flash_wl:
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3"]
       reason: only one target per arch needed
-
   depends_components:
     - esp_partition
     - spi_flash
     - fatfs
     - vfs
     - wear_leveling
-    
+
 components/fatfs/test_apps/sdcard:
   disable:
     - if: IDF_TARGET == "esp32p4"
diff --git a/examples/build_system/cmake/import_prebuilt/main/project_include.cmake b/examples/build_system/cmake/import_prebuilt/main/project_include.cmake
index 9bf6e7cb6e..4f262f8e42 100644
--- a/examples/build_system/cmake/import_prebuilt/main/project_include.cmake
+++ b/examples/build_system/cmake/import_prebuilt/main/project_include.cmake
@@ -1,6 +1,14 @@
 # For users checking this example, ignore the following code. This is so that
 # the prebuilt project is built automatically in ESP-IDF CI.
 if("$ENV{CI}")
+    # otherwise these file won't be rebuilt when switching the built target within the same job
+    file(REMOVE
+                ${CMAKE_SOURCE_DIR}/prebuilt/sdkconfig
+                ${CMAKE_SOURCE_DIR}/main/libprebuilt.a
+                ${CMAKE_SOURCE_DIR}/main/prebuilt.h
+        )
+    file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/prebuilt/build)
+
     execute_process(COMMAND ${IDFTOOL} build
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/prebuilt)
 endif()
diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
index e22a8681fc..f1ba770c6f 100644
--- a/examples/protocols/.build-test-rules.yml
+++ b/examples/protocols/.build-test-rules.yml
@@ -282,8 +282,7 @@ examples/protocols/sockets/non_blocking:
 examples/protocols/sockets/tcp_client:
   disable_test:
     - if: SOC_WIFI_SUPPORTED != 1
-  enable:
-    - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
+  # linux target won't work with CONFIG_EXAMPLE_SOCKET_IP_INPUT_STDIN=y
   disable:
     - if: IDF_TARGET == "esp32p4"
       temporary: true
diff --git a/examples/protocols/sockets/tcp_client/README.md b/examples/protocols/sockets/tcp_client/README.md
index 89b32f3b0a..59218a487e 100644
--- a/examples/protocols/sockets/tcp_client/README.md
+++ b/examples/protocols/sockets/tcp_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | Linux |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | ----- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 
 # TCP Client example
diff --git a/examples/storage/littlefs/main/idf_component.yml b/examples/storage/littlefs/main/idf_component.yml
index 95c7329ae1..6f83c9dfd6 100644
--- a/examples/storage/littlefs/main/idf_component.yml
+++ b/examples/storage/littlefs/main/idf_component.yml
@@ -1,6 +1,3 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  joltwallet/littlefs: "==1.5.5"
-  ## Required IDF version
-  idf:
-    version: ">=5.2.0"
+  joltwallet/littlefs: "~=1.10.0"
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index a90a4aee62..bfac822ab9 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -195,6 +195,9 @@ examples/system/ota/pre_encrypted_ota:
     - if: IDF_TARGET in ["esp32h2", "esp32p4"]
       temporary: true
       reason: target esp32h2, esp32p4 is not supported yet
+    - if: CONFIG_NAME == "partial_download" and IDF_TARGET == "esp32c3"
+      temporary: true
+      reason: build failed
   disable_test:
     - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
       temporary: true