Merge branch 'feature/examples_use_manifest_for_deps' into 'master'

feat(examples): add local components via idf_component.yml See merge request espressif/esp-idf!25228
2024-10-05 20:47:46 -04:00 · 2023-09-20 20:14:14 +08:00 · 2023-09-20 20:14:14 +08:00 · fc4f091e7a
commit fc4f091e7a
parent 46a692fd22 8c26ddf4a1
202 changed files with 428 additions and 273 deletions
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@ -64,11 +64,12 @@ check_version:
    - export IDF_PATH=$PWD
    - tools/ci/check_idf_version.sh

-check_rom_api_header:
+check_api_usage:
  extends: .pre_check_template
  script:
    - tools/ci/check_examples_rom_header.sh
    - tools/ci/check_api_violation.sh
+    - tools/ci/check_examples_extra_component_dirs.sh

 test_check_kconfigs:
  extends: .pre_check_template
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt
@ -2,11 +2,6 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

 project(aligenie_demo)
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/idf_component.yml
@ -0,0 +1,9 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt
@ -2,10 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_client)
--- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/idf_component.yml
@ -0,0 +1,9 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_server)
--- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/main/idf_component.yml
@ -0,0 +1,9 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt
@ -2,8 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(fast_prov_client)
--- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/main/idf_component.yml
@ -0,0 +1,5 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  fast_prov:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov
--- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt
@ -2,8 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(fast_prov_server)
--- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/main/idf_component.yml
@ -0,0 +1,5 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  fast_prov:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov
--- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_client)
--- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_server)
--- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
--- a/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(provisioner)
--- a/examples/bluetooth/esp_ble_mesh/provisioner/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/provisioner/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt
@ -2,10 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_mesh_provisioner)
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/main/idf_component.yml
@ -0,0 +1,9 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_server)
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(onoff_server)
--- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  light_driver:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt
@ -2,8 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sensor_client)
--- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/main/idf_component.yml
@ -0,0 +1,5 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
--- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sensor_server)
--- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
--- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(vendor_client)
--- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  button:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  example_nvs:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
--- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(vendor_server)
--- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
--- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov
-                         $ENV{IDF_PATH}/examples/common_components/iperf)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(wifi_coexist)
--- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/idf_component.yml
+++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  fast_prov:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov
+  example_init:
+    path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init
+  iperf:
+    path: ${IDF_PATH}/examples/common_components/iperf
--- a/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt
+++ b/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt
@ -2,8 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-# This example uses an extra component for common functions for Bluetooth HCI layer.
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/hci/hci_common_component)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_adv_scan)
--- a/examples/bluetooth/hci/ble_adv_scan_combined/main/idf_component.yml
+++ b/examples/bluetooth/hci/ble_adv_scan_combined/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  hci_common_component:
+    path: ${IDF_PATH}/examples/bluetooth/hci/hci_common_component
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt
+++ b/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt
@ -2,8 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-# This example uses an extra component for common functions for Bluetooth HCI layer.
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/hci/hci_common_component)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_adv)
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/main/idf_component.yml
+++ b/examples/bluetooth/hci/controller_vhci_ble_adv/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  hci_common_component:
+    path: ${IDF_PATH}/examples/bluetooth/hci/hci_common_component
--- a/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_dynamic_service)
--- a/examples/bluetooth/nimble/ble_dynamic_service/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_dynamic_service/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(enc_adv_data_cent)
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(enc_adv_data_prph)
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(htp_cent)
--- a/examples/bluetooth/nimble/ble_htp/htp_cent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_htp/htp_cent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(coc_blecent)
--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(coc_bleprph)
--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_multi_adv)
--- a/examples/bluetooth/nimble/ble_multi_adv/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_multi_adv/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(blecent)
--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bleprph)
--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt
@ -1,7 +1,6 @@
 # The following lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_periodic_adv)
--- a/examples/bluetooth/nimble/ble_periodic_adv/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_periodic_adv/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt
@ -1,6 +1,5 @@
 # The following lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_periodic_sync)
--- a/examples/bluetooth/nimble/ble_periodic_sync/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_periodic_sync/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(phy_cent)
--- a/examples/bluetooth/nimble/ble_phy/phy_cent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_phy/phy_cent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(phy_prph)
--- a/examples/bluetooth/nimble/ble_phy/phy_prph/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_phy/phy_prph/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(proximity_sensor_cent)
--- a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spp_client)
--- a/examples/bluetooth/nimble/ble_spp/spp_client/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_spp/spp_client/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt
+++ b/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spp_server)
--- a/examples/bluetooth/nimble/ble_spp/spp_server/main/idf_component.yml
+++ b/examples/bluetooth/nimble/ble_spp/spp_server/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/blecent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/blecent/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(blecent)
--- a/examples/bluetooth/nimble/blecent/main/idf_component.yml
+++ b/examples/bluetooth/nimble/blecent/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_central_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils
--- a/examples/bluetooth/nimble/bleprph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/bleprph/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bleprph)
--- a/examples/bluetooth/nimble/bleprph/main/idf_component.yml
+++ b/examples/bluetooth/nimble/bleprph/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/bluetooth/nimble/power_save/CMakeLists.txt
+++ b/examples/bluetooth/nimble/power_save/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(power_save)
--- a/examples/bluetooth/nimble/power_save/main/idf_component.yml
+++ b/examples/bluetooth/nimble/power_save/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  nimble_peripheral_utils:
+    path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils
--- a/examples/common_components/protocol_examples_tapif_io/README.md
+++ b/examples/common_components/protocol_examples_tapif_io/README.md
@ -7,9 +7,11 @@ It could be used to route lwip traffic to host side network, typically when work

 ### Usage of the API

-1) Add the path to this component to the `EXTRA_COMPONENT_DIRS` in your project makefile
-```cmake
-list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/common_components/tapif_io")
+1) Add the path to this component to as a dependency to the `main` component of your project using the following idf_component.yml file:
+```yaml
+dependencies:
+  tapif_io:
+    path: ${IDF_PATH}/examples/common_components/tapif_io
 ```
 2) Include lwip and linux side of the configuration
 ```cpp
--- a/examples/ethernet/iperf/CMakeLists.txt
+++ b/examples/ethernet/iperf/CMakeLists.txt
@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components
-                         $ENV{IDF_PATH}/examples/common_components/iperf
-                         $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ethernet_iperf)
--- a/examples/ethernet/iperf/main/idf_component.yml
+++ b/examples/ethernet/iperf/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  cmd_system:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init
+  iperf:
+    path: ${IDF_PATH}/examples/common_components/iperf
--- a/examples/network/bridge/CMakeLists.txt
+++ b/examples/network/bridge/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bridge)
--- a/examples/network/bridge/main/idf_component.yml
+++ b/examples/network/bridge/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init
--- a/examples/network/eth2ap/CMakeLists.txt
+++ b/examples/network/eth2ap/CMakeLists.txt
@ -1,6 +1,4 @@
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(eth2ap)
--- a/examples/network/eth2ap/main/idf_component.yml
+++ b/examples/network/eth2ap/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init
--- a/examples/network/simple_sniffer/CMakeLists.txt
+++ b/examples/network/simple_sniffer/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(simple_sniffer)
--- a/examples/network/simple_sniffer/main/idf_component.yml
+++ b/examples/network/simple_sniffer/main/idf_component.yml
@ -1,2 +1,4 @@
 dependencies:
  pcap: "^1.0.0"
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init
--- a/examples/network/sta2eth/CMakeLists.txt
+++ b/examples/network/sta2eth/CMakeLists.txt
@ -2,9 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-# This example needs a DNS server: let's use the simple DNS server implementation from captive portal example
-set(EXTRA_COMPONENT_DIRS    $ENV{IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server
-                            $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sta_to_eth)
--- a/examples/network/sta2eth/main/idf_component.yml
+++ b/examples/network/sta2eth/main/idf_component.yml
@ -5,5 +5,9 @@ dependencies:
    rules:
      - if: "idf_version >=4.4"
      - if: "target in [esp32s2, esp32s3]"
+  dns_server:
+    path: ${IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init

  idf: "^5.0"
--- a/examples/network/vlan_support/CMakeLists.txt
+++ b/examples/network/vlan_support/CMakeLists.txt
@ -3,8 +3,6 @@
 # The following five lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
-
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

 project(vlan_support)
--- a/examples/network/vlan_support/main/idf_component.yml
+++ b/examples/network/vlan_support/main/idf_component.yml
@ -0,0 +1,3 @@
+dependencies:
+  ethernet_init:
+    path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init
--- a/examples/openthread/ot_br/CMakeLists.txt
+++ b/examples/openthread/ot_br/CMakeLists.txt
@ -2,10 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common
-                         $ENV{IDF_PATH}/examples/common_components/iperf)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_ot_br)
--- a/examples/openthread/ot_br/main/idf_component.yml
+++ b/examples/openthread/ot_br/main/idf_component.yml
@ -6,3 +6,7 @@ dependencies:
  ## Required IDF version
  idf:
    version: ">=5.0"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
+  iperf:
+    path: ${IDF_PATH}/examples/common_components/iperf
--- a/examples/openthread/ot_cli/CMakeLists.txt
+++ b/examples/openthread/ot_cli/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/iperf)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_ot_cli)
--- a/examples/openthread/ot_cli/main/idf_component.yml
+++ b/examples/openthread/ot_cli/main/idf_component.yml
@ -4,3 +4,5 @@ dependencies:
    version: "~0.4.0"
  idf:
    version: ">=4.1.0"
+  iperf:
+    path: ${IDF_PATH}/examples/common_components/iperf
--- a/examples/peripherals/i2c/i2c_tools/CMakeLists.txt
+++ b/examples/peripherals/i2c/i2c_tools/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(i2c_tools)
--- a/examples/peripherals/i2c/i2c_tools/main/idf_component.yml
+++ b/examples/peripherals/i2c/i2c_tools/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  cmd_system:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system
+  cmd_nvs:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs
+  cmd_wifi:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi
--- a/examples/peripherals/usb/host/uvc/CMakeLists.txt
+++ b/examples/peripherals/usb/host/uvc/CMakeLists.txt
@ -2,7 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(usb-uvc)
--- a/examples/peripherals/usb/host/uvc/main/idf_component.yml
+++ b/examples/peripherals/usb/host/uvc/main/idf_component.yml
@ -5,3 +5,5 @@ dependencies:
  mdns:
    rules:
      - if: "idf_version >= 5.0"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
--- a/examples/phy/cert_test/CMakeLists.txt
+++ b/examples/phy/cert_test/CMakeLists.txt
@ -2,7 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(cert_test)
--- a/examples/phy/cert_test/main/idf_component.yml
+++ b/examples/phy/cert_test/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  cmd_system:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system
+  cmd_nvs:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs
+  cmd_wifi:
+    path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi
--- a/examples/protocols/esp_http_client/CMakeLists.txt
+++ b/examples/protocols/esp_http_client/CMakeLists.txt
@ -2,10 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
-
 if(${IDF_TARGET} STREQUAL "linux")
-    list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs)
    set(COMPONENTS main)
 endif()

--- a/examples/protocols/esp_http_client/main/idf_component.yml
+++ b/examples/protocols/esp_http_client/main/idf_component.yml
@ -0,0 +1,7 @@
+dependencies:
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
+  esp_stubs:
+    path: ${IDF_PATH}/examples/protocols/linux_stubs/esp_stubs
+    rules:
+    - if: "target in [linux]"
--- a/Show More
+++ b/Show More