Skip to content

Commit d7b210b

Browse files
committed
Remove conditional inclusion of builder specified components
CCACHE is very fast and it also causes issues with memory variants
1 parent 177dc97 commit d7b210b

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

Diff for: build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ if [ "$BUILD_TYPE" != "all" ]; then
169169

170170
echo "idf.py -DIDF_TARGET=\"$target\" -DSDKCONFIG_DEFAULTS=\"$configs\" $BUILD_TYPE"
171171
rm -rf build sdkconfig
172-
COMPONENTS_SUBSET=full idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
172+
idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
173173
if [ $? -ne 0 ]; then exit 1; fi
174174
done
175175
exit 0
@@ -223,11 +223,11 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
223223

224224
echo "* Build IDF-Libs: $idf_libs_configs"
225225
rm -rf build sdkconfig
226-
COMPONENTS_SUBSET=full idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
226+
idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
227227
if [ $? -ne 0 ]; then exit 1; fi
228228

229229
if [ "$target" == "esp32s3" ]; then
230-
COMPONENTS_SUBSET=full idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" srmodels_bin
230+
idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" srmodels_bin
231231
if [ $? -ne 0 ]; then exit 1; fi
232232
AR_SDK="$AR_TOOLS/esp32-arduino-libs/$target"
233233
# sr model.bin
@@ -248,7 +248,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
248248

249249
echo "* Build BootLoader: $bootloader_configs"
250250
rm -rf build sdkconfig
251-
COMPONENTS_SUBSET=none idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
251+
idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
252252
if [ $? -ne 0 ]; then exit 1; fi
253253
done
254254

@@ -261,7 +261,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
261261

262262
echo "* Build Memory Variant: $mem_configs"
263263
rm -rf build sdkconfig
264-
COMPONENTS_SUBSET=none idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
264+
idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
265265
if [ $? -ne 0 ]; then exit 1; fi
266266
done
267267
done

Diff for: main/idf_component.yml

-8
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,18 @@ dependencies:
77
require: public
88
rules:
99
- if: "target in [esp32, esp32s2, esp32s3]"
10-
- if: "$COMPONENTS_SUBSET in [full, all]"
1110
espressif/esp-tflite-micro:
1211
version: ">=1.2.0"
1312
require: public
1413
rules:
1514
- if: "target not in [esp32c2]"
16-
- if: "$COMPONENTS_SUBSET in [full, all]"
1715
# ESP-DL for ESP32, ESP32S2 and ESP32-S3
1816
# espressif/esp-dl-old:
1917
# version: "af7808ba09448ce82c704455975d4cf1e4305fd7"
2018
# git: https://github.com/espressif/esp-dl.git
2119
# require: public
2220
# rules:
2321
# - if: "target in [esp32s3, esp32s2, esp32]"
24-
# - if: "$COMPONENTS_SUBSET in [full, all]"
2522
# ESP-DL for ESP32-P4
2623
espressif/esp-dl:
2724
version: "master"
@@ -30,7 +27,6 @@ dependencies:
3027
require: public
3128
rules:
3229
- if: "target in [esp32p4]"
33-
- if: "$COMPONENTS_SUBSET in [full, all]"
3430
# ESP-DL Face Detection for ESP32-P4
3531
espressif/human_face_detect:
3632
version: "master"
@@ -39,7 +35,6 @@ dependencies:
3935
require: public
4036
rules:
4137
- if: "target in [esp32p4]"
42-
- if: "$COMPONENTS_SUBSET in [full, all]"
4338
# ESP-DL Pedestrian Detection for ESP32-P4
4439
espressif/pedestrian_detect:
4540
version: "master"
@@ -48,18 +43,15 @@ dependencies:
4843
require: public
4944
rules:
5045
- if: "target in [esp32p4]"
51-
- if: "$COMPONENTS_SUBSET in [full, all]"
5246
espressif/esp-sr:
5347
version: ">=1.4.2"
5448
rules:
5549
- if: "target in [esp32s3]"
56-
- if: "$COMPONENTS_SUBSET in [full, all]"
5750
espressif/esp_matter:
5851
version: "^1.3.0"
5952
require: public
6053
rules:
6154
- if: "target not in [esp32c2, esp32h2, esp32p4]"
62-
- if: "$COMPONENTS_SUBSET in [full, all]"
6355

6456
# esp-sr: "^1.3.1"
6557
# esp32-camera: "^2.0.4"

0 commit comments

Comments
 (0)