From 2e32cdb3b2ac2fb4d060a4fc5abbda059165cda5 Mon Sep 17 00:00:00 2001 From: Shubham Kulkarni Date: Mon, 14 Oct 2019 17:56:21 -0300 Subject: [PATCH] Merge branch 'bugfix/CMake_esp_https_ota_dependencies' into master components/esp_https_ota: Changes in public requirement list for CMake and esp_ota_ops.h is included in esp_https_ota.c bootloader_support is added in public requirements of CMake bootloader_common.h is included in esp_https_ota.h Closes https://github.com/espressif/esp-idf/issues/4198 Closes IDFGH-2066 --- components/esp_https_ota/CMakeLists.txt | 2 +- components/esp_https_ota/include/esp_https_ota.h | 2 +- components/esp_https_ota/src/esp_https_ota.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/esp_https_ota/CMakeLists.txt b/components/esp_https_ota/CMakeLists.txt index 6ef0a5c9e0..d0a4ee8385 100644 --- a/components/esp_https_ota/CMakeLists.txt +++ b/components/esp_https_ota/CMakeLists.txt @@ -1,7 +1,7 @@ set(COMPONENT_ADD_INCLUDEDIRS include) set(COMPONENT_SRCS "src/esp_https_ota.c") -set(COMPONENT_REQUIRES esp_http_client) +set(COMPONENT_REQUIRES esp_http_client bootloader_support) set(COMPONENT_PRIV_REQUIRES log app_update) register_component() diff --git a/components/esp_https_ota/include/esp_https_ota.h b/components/esp_https_ota/include/esp_https_ota.h index 7feba8f7ee..fd69f27f89 100644 --- a/components/esp_https_ota/include/esp_https_ota.h +++ b/components/esp_https_ota/include/esp_https_ota.h @@ -15,7 +15,7 @@ #pragma once #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/components/esp_https_ota/src/esp_https_ota.c b/components/esp_https_ota/src/esp_https_ota.c index d2ca501039..fc855e00f9 100644 --- a/components/esp_https_ota/src/esp_https_ota.c +++ b/components/esp_https_ota/src/esp_https_ota.c @@ -17,6 +17,7 @@ #include #include #include +#include #define IMAGE_HEADER_SIZE sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t) + 1 #define DEFAULT_OTA_BUF_SIZE IMAGE_HEADER_SIZE