From 31ec634730f44dcaf1c1c843e7315a1785d326ca Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 25 Jun 2019 16:53:37 +0800 Subject: [PATCH 1/3] bt: fix build issue Source files and include directories were appended to variables used by the previous component registration command. --- components/bt/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index bae50179d9..e6e76db345 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -288,7 +288,7 @@ if(CONFIG_BT_ENABLED) endif() if (CONFIG_BLE_MESH) - list(APPEND COMPONENT_ADD_INCLUDEDIRS + list(APPEND include_dirs "bluedroid/osi/include" "ble_mesh/mesh_core" "ble_mesh/mesh_core/include" @@ -299,7 +299,7 @@ if (CONFIG_BLE_MESH) "ble_mesh/api/models/include" "ble_mesh/api") - list(APPEND COMPONENT_SRCS + list(APPEND srcs "ble_mesh/api/core/esp_ble_mesh_common_api.c" "ble_mesh/api/core/esp_ble_mesh_local_data_operation_api.c" "ble_mesh/api/core/esp_ble_mesh_low_power_api.c" From 94b88654a37391b110021f3e9ce227c50651d946 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 25 Jun 2019 20:12:35 +0800 Subject: [PATCH 2/3] ci: exclude nimble submodule from python style check --- .flake8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.flake8 b/.flake8 index da9f0bef01..63b5c10d51 100644 --- a/.flake8 +++ b/.flake8 @@ -148,7 +148,8 @@ exclude = components/mbedtls/mbedtls, components/expat/expat, components/unity/unity, - examples/build_system/cmake/import_lib/main/lib/tinyxml2 + examples/build_system/cmake/import_lib/main/lib/tinyxml2, + components/nimble/nimble, # other third-party libraries tools/kconfig_new/kconfiglib.py, # autogenerated scripts From 82858050b672efb69f85e574b0f97dbbf959fd22 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 25 Jun 2019 20:18:36 +0800 Subject: [PATCH 3/3] ci: sort list of flake8 submodule excludes --- .flake8 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.flake8 b/.flake8 index 63b5c10d51..617bcbb282 100644 --- a/.flake8 +++ b/.flake8 @@ -140,16 +140,16 @@ exclude = .git, __pycache__, # submodules - components/esptool_py/esptool, components/bootloader/subproject/components/micro-ecc/micro-ecc, - components/nghttp/nghttp2, - components/libsodium/libsodium, - components/json/cJSON, - components/mbedtls/mbedtls, + components/esptool_py/esptool, components/expat/expat, + components/json/cJSON, + components/libsodium/libsodium, + components/mbedtls/mbedtls, + components/nghttp/nghttp2, + components/nimble/nimble, components/unity/unity, examples/build_system/cmake/import_lib/main/lib/tinyxml2, - components/nimble/nimble, # other third-party libraries tools/kconfig_new/kconfiglib.py, # autogenerated scripts