From 7af1de5a82225b8f1828bc2f77ac4b8e218d5472 Mon Sep 17 00:00:00 2001 From: Tan Yan Quan Date: Fri, 28 Mar 2025 10:28:20 +0800 Subject: [PATCH] fix(openthread): change include statement to updated upstream path --- components/openthread/openthread | 2 +- components/openthread/sbom_openthread.yml | 2 +- components/openthread/src/port/esp_uart_spinel_interface.cpp | 4 ++-- .../openthread/src/spinel/esp_radio_spinel_uart_interface.cpp | 2 +- examples/zigbee/.build-test-rules.yml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/openthread/openthread b/components/openthread/openthread index 9398342b49..ff6a90f062 160000 --- a/components/openthread/openthread +++ b/components/openthread/openthread @@ -1 +1 @@ -Subproject commit 9398342b49a03cd140fae910b81cddf9084293a0 +Subproject commit ff6a90f062c9d7d9e4aadf855fad4be3e3ebb1fa diff --git a/components/openthread/sbom_openthread.yml b/components/openthread/sbom_openthread.yml index 1021051236..aa43c425c5 100644 --- a/components/openthread/sbom_openthread.yml +++ b/components/openthread/sbom_openthread.yml @@ -5,4 +5,4 @@ supplier: 'Organization: Espressif Systems (Shanghai) CO LTD' originator: 'Organization: Google LLC' description: OpenThread released by Google is an open-source implementation of the Thread networking url: https://github.com/espressif/openthread -hash: 9398342b49a03cd140fae910b81cddf9084293a0 +hash: ff6a90f062c9d7d9e4aadf855fad4be3e3ebb1fa diff --git a/components/openthread/src/port/esp_uart_spinel_interface.cpp b/components/openthread/src/port/esp_uart_spinel_interface.cpp index 8a4de3b953..728d9f1821 100644 --- a/components/openthread/src/port/esp_uart_spinel_interface.cpp +++ b/components/openthread/src/port/esp_uart_spinel_interface.cpp @@ -18,8 +18,8 @@ #include "esp_openthread_types.h" #include "esp_openthread_uart.h" #include "driver/uart_vfs.h" -#include "include/common/code_utils.hpp" -#include "core/common/logging.hpp" +#include "common/code_utils.hpp" +#include "common/logging.hpp" #include "driver/uart.h" #include "lib/platform/exit_code.h" #include "openthread/platform/time.h" diff --git a/components/openthread/src/spinel/esp_radio_spinel_uart_interface.cpp b/components/openthread/src/spinel/esp_radio_spinel_uart_interface.cpp index b01ef694c2..9c57e54bdf 100644 --- a/components/openthread/src/spinel/esp_radio_spinel_uart_interface.cpp +++ b/components/openthread/src/spinel/esp_radio_spinel_uart_interface.cpp @@ -11,7 +11,7 @@ #include "esp_openthread_common_macro.h" #include "openthread/platform/time.h" #include "hdlc.hpp" -#include "core/common/code_utils.hpp" +#include "common/code_utils.hpp" namespace esp { namespace radio_spinel { diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml index eb8c7d7bcc..88146d0eed 100644 --- a/examples/zigbee/.build-test-rules.yml +++ b/examples/zigbee/.build-test-rules.yml @@ -3,6 +3,7 @@ .zigbee_dependencies: &zigbee_dependencies depends_components: - ieee802154 + - openthread depends_filepatterns: - examples/zigbee/light_sample/**/*