Skip to content

Commit e18eecd

Browse files
committed
Fix build for latest ESP-SR
1 parent 0235a8b commit e18eecd

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

Diff for: tools/update-components.sh

+17-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
1414
#
1515
# CLONE/UPDATE ARDUINO
1616
#
17-
17+
echo "Updating ESP32 Arduino..."
1818
if [ ! -d "$AR_COMPS/arduino" ]; then
1919
git clone $AR_REPO_URL "$AR_COMPS/arduino"
2020
fi
@@ -56,23 +56,23 @@ if [ $? -ne 0 ]; then exit 1; fi
5656
#
5757
# CLONE/UPDATE ESP32-CAMERA
5858
#
59-
59+
echo "Updating ESP32 Camera..."
6060
if [ ! -d "$AR_COMPS/esp32-camera" ]; then
6161
git clone $CAMERA_REPO_URL "$AR_COMPS/esp32-camera"
6262
else
6363
git -C "$AR_COMPS/esp32-camera" fetch && \
6464
git -C "$AR_COMPS/esp32-camera" pull --ff-only
6565
fi
66-
#this is a temp measure to fix build issue in recent IDF master
67-
if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
68-
rm -rf "$AR_COMPS/esp32-camera/idf_component.yml"
69-
fi
66+
#this is a temp measure to fix build issue
67+
# if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
68+
# rm -rf "$AR_COMPS/esp32-camera/idf_component.yml"
69+
# fi
7070
if [ $? -ne 0 ]; then exit 1; fi
7171

7272
#
7373
# CLONE/UPDATE ESP-DL
7474
#
75-
75+
echo "Updating ESP-DL..."
7676
if [ ! -d "$AR_COMPS/esp-dl" ]; then
7777
git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
7878
else
@@ -84,19 +84,23 @@ if [ $? -ne 0 ]; then exit 1; fi
8484
#
8585
# CLONE/UPDATE ESP-SR
8686
#
87-
87+
echo "Updating ESP-SR..."
8888
if [ ! -d "$AR_COMPS/esp-sr" ]; then
8989
git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
9090
else
9191
git -C "$AR_COMPS/esp-sr" fetch && \
9292
git -C "$AR_COMPS/esp-sr" pull --ff-only
9393
fi
94+
#this is a temp measure to fix build issue
95+
if [ -f "$AR_COMPS/esp-sr/idf_component.yml" ]; then
96+
rm -rf "$AR_COMPS/esp-sr/idf_component.yml"
97+
fi
9498
if [ $? -ne 0 ]; then exit 1; fi
9599

96100
#
97101
# CLONE/UPDATE ESP-LITTLEFS
98102
#
99-
103+
echo "Updating ESP-LITTLEFS..."
100104
if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
101105
git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
102106
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
@@ -110,7 +114,7 @@ if [ $? -ne 0 ]; then exit 1; fi
110114
#
111115
# CLONE/UPDATE ESP-RAINMAKER
112116
#
113-
117+
echo "Updating ESP-RainMaker..."
114118
if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
115119
git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" && \
116120
git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
@@ -124,7 +128,7 @@ if [ $? -ne 0 ]; then exit 1; fi
124128
#
125129
# CLONE/UPDATE ESP-INSIGHTS
126130
#
127-
131+
echo "Updating ESP-Insights..."
128132
if [ ! -d "$AR_COMPS/esp-insights" ]; then
129133
git clone $INSIGHTS_REPO_URL "$AR_COMPS/esp-insights" && \
130134
git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
@@ -138,7 +142,7 @@ if [ $? -ne 0 ]; then exit 1; fi
138142
#
139143
# CLONE/UPDATE ESP-DSP
140144
#
141-
145+
echo "Updating ESP-DSP..."
142146
if [ ! -d "$AR_COMPS/esp-dsp" ]; then
143147
git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
144148
else
@@ -150,7 +154,7 @@ if [ $? -ne 0 ]; then exit 1; fi
150154
#
151155
# CLONE/UPDATE TINYUSB
152156
#
153-
157+
echo "Updating TinyUSB..."
154158
if [ ! -d "$AR_COMPS/arduino_tinyusb/tinyusb" ]; then
155159
git clone $TINYUSB_REPO_URL "$AR_COMPS/arduino_tinyusb/tinyusb"
156160
else

0 commit comments

Comments
 (0)