Skip to content

Commit 7f8dda8

Browse files
committed
Fix builds caused by esp-dl requirement
1 parent 29d1440 commit 7f8dda8

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cmake_minimum_required(VERSION 3.5)
44

55
set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
6-
set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
6+
set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components)
77

88
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
99
project(arduino-lib-builder)

tools/update-components.sh

+4-18
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ else
6262
git -C "$AR_COMPS/esp32-camera" fetch && \
6363
git -C "$AR_COMPS/esp32-camera" pull --ff-only
6464
fi
65-
#this is a temp measure to fix build issue
66-
# if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
67-
# rm -rf "$AR_COMPS/esp32-camera/idf_component.yml"
68-
# fi
6965
if [ $? -ne 0 ]; then exit 1; fi
7066

7167
#
@@ -79,6 +75,10 @@ else
7975
git -C "$AR_COMPS/esp-dl" pull --ff-only
8076
fi
8177
if [ $? -ne 0 ]; then exit 1; fi
78+
#this is a temp measure to fix build issue
79+
if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
80+
rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
81+
fi
8282

8383
#
8484
# CLONE/UPDATE ESP-LITTLEFS
@@ -108,20 +108,6 @@ else
108108
fi
109109
if [ $? -ne 0 ]; then exit 1; fi
110110

111-
#
112-
# CLONE/UPDATE ESP-INSIGHTS
113-
#
114-
# echo "Updating ESP-Insights..."
115-
# if [ ! -d "$AR_COMPS/esp-insights" ]; then
116-
# git clone $INSIGHTS_REPO_URL "$AR_COMPS/esp-insights" && \
117-
# git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
118-
# else
119-
# git -C "$AR_COMPS/esp-insights" fetch && \
120-
# git -C "$AR_COMPS/esp-insights" pull --ff-only && \
121-
# git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
122-
# fi
123-
# if [ $? -ne 0 ]; then exit 1; fi
124-
125111
#
126112
# CLONE/UPDATE ESP-DSP
127113
#

0 commit comments

Comments
 (0)