Skip to content

Commit 017601a

Browse files
authored
Fix install of IDF components (#3034)
***NO_CI***
1 parent 0516bd1 commit 017601a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

CMake/binutils.ESP32.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,17 +566,18 @@ macro(nf_install_idf_component_from_registry component_name object_id)
566566

567567
message(STATUS "Checking if component '" ${component_name} "' needs to be installed")
568568

569-
set(downloadUrl https://components.espressif.com/api/download/?object_type=component&object_id=${object_id})
569+
set(downloadUrl https://components.espressif.com/api/downloads/?object_type=component&object_id=${object_id})
570570
set(archiveName ${CMAKE_BINARY_DIR}/downloads/${component_name}_${object_id}.zip)
571571
set(destinationPath ${IDF_PATH_CMAKED}/components/${component_name})
572+
set(extractPath ${IDF_PATH_CMAKED}/components)
572573

573574
if(NOT EXISTS ${destinationPath})
574575
file(DOWNLOAD ${downloadUrl} ${archiveName})
575576
message(STATUS "Component archive '" ${component_name} "' downloaded")
576577

577578
file(ARCHIVE_EXTRACT
578579
INPUT ${archiveName}
579-
DESTINATION ${destinationPath}
580+
DESTINATION ${extractPath}
580581
)
581582

582583
# Remove idf_component.yml file otherwise we will get warning about Component manager not being enabled
@@ -593,11 +594,11 @@ macro(nf_add_idf_as_library)
593594
# Load any required Components from Component registry
594595
# Must be done before "tools/cmake/idf.cmake"
595596
if(ESP32_USB_CDC)
596-
nf_install_idf_component_from_registry(tinyusb a4c3e214-fc79-4264-8dfe-92f1555440b3)
597-
nf_install_idf_component_from_registry(esp_tinyusb 65318090-af6e-4dbe-a257-5074ed07a337)
597+
nf_install_idf_component_from_registry(tinyusb 55142eec-a3a4-47a5-ad01-4ba3ef44444b)
598+
nf_install_idf_component_from_registry(esp_tinyusb 8115ffc9-366a-4340-94ab-e327aed20831)
598599
endif()
599600

600-
nf_install_idf_component_from_registry(littlefs a52ea255-cc2f-483c-a742-e4631623b8c2)
601+
nf_install_idf_component_from_registry(littlefs 4831aa41-8b72-48ac-a534-910a985a5519)
601602

602603
include(${IDF_PATH_CMAKED}/tools/cmake/idf.cmake)
603604

0 commit comments

Comments
 (0)