espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 14:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/partition_table_depends_esptoolpy' into 'master'

Browse Source 
esptool_py: Fix issue where build with limited components doesn't include esptool_py

Closes IDFGH-4876 and IDFGH-4874

See merge request espressif/esp-idf!12653
This commit is contained in:
Angus Gratton
2021-03-31 01:30:33 +00:00
parent d44034c54d 9c03f04769
commit fda565a5bf
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/app_update/CMakeLists.txt
View File

@@ -1,7 +1,8 @@
idf_component_register(SRCS "esp_ota_ops.c" idf_component_register(SRCS "esp_ota_ops.c"
"esp_app_desc.c" "esp_app_desc.c"
INCLUDE_DIRS "include" INCLUDE_DIRS "include"
REQUIRES spi_flash partition_table bootloader_support) REQUIRES spi_flash partition_table bootloader_support
PRIV_REQUIRES esptool_py)
# esp_app_desc structure is added as an undefined symbol because otherwise the # esp_app_desc structure is added as an undefined symbol because otherwise the
# linker will ignore this structure as it has no other files depending on it. # linker will ignore this structure as it has no other files depending on it.

2
components/bootloader/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
idf_component_register(PRIV_REQUIRES partition_table) idf_component_register(PRIV_REQUIRES partition_table esptool_py)
# Do not generate flash file when building bootloader or is in early expansion of the build # Do not generate flash file when building bootloader or is in early expansion of the build
if(BOOTLOADER_BUILD OR NOT CONFIG_APP_BUILD_BOOTLOADER) if(BOOTLOADER_BUILD OR NOT CONFIG_APP_BUILD_BOOTLOADER)

4
components/esp_wifi/CMakeLists.txt
View File

@@ -35,9 +35,9 @@ idf_component_register(SRCS "src/coexist.c"
"src/wifi_netif.c" "src/wifi_netif.c"
"${idf_target}/esp_adapter.c" "${idf_target}/esp_adapter.c"
INCLUDE_DIRS "include" "${idf_target}/include" INCLUDE_DIRS "include" "${idf_target}/include"
PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif driver ${extra_priv_requires}
REQUIRES esp_event REQUIRES esp_event
PRIV_REQUIRES esp_timer esp_pm wpa_supplicant nvs_flash esp_netif ${extra_priv_requires} PRIV_REQUIRES driver esptool_py esp_netif esp_pm esp_timer nvs_flash
wpa_supplicant ${extra_priv_requires}
LDFRAGMENTS "${ldfragments}") LDFRAGMENTS "${ldfragments}")
idf_build_get_property(build_dir BUILD_DIR) idf_build_get_property(build_dir BUILD_DIR)

2
components/partition_table/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
idf_component_register() idf_component_register(PRIV_REQUIRES esptool_py)
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
return() return()

2
components/spiffs/CMakeLists.txt
View File

@@ -8,6 +8,6 @@ idf_component_register(SRCS "esp_spiffs.c"
INCLUDE_DIRS "include" INCLUDE_DIRS "include"
PRIV_INCLUDE_DIRS "." "spiffs/src" PRIV_INCLUDE_DIRS "." "spiffs/src"
REQUIRES spi_flash REQUIRES spi_flash
PRIV_REQUIRES bootloader_support) PRIV_REQUIRES bootloader_support esptool_py)
set_source_files_properties(spiffs/src/spiffs_nucleus.c PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation) set_source_files_properties(spiffs/src/spiffs_nucleus.c PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation)