From e892c2e7c2e321ed8b044996f17fc62e75dbb7fa Mon Sep 17 00:00:00 2001 From: John Spaith Date: Wed, 25 Sep 2019 12:55:34 -0700 Subject: Add use_prov_client as a FEATURE --- .../no-etw-check-cmake.patch | Bin 0 -> 1628 bytes ports/azure-c-shared-utility/portfile.cmake | 12 +++++------ ports/azure-iot-sdk-c/CONTROL | 5 ++++- ports/azure-iot-sdk-c/portfile.cmake | 22 +++++++++++++++------ ports/azure-macro-utils-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/portfile.cmake | 8 ++++---- 6 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 ports/azure-c-shared-utility/no-etw-check-cmake.patch diff --git a/ports/azure-c-shared-utility/no-etw-check-cmake.patch b/ports/azure-c-shared-utility/no-etw-check-cmake.patch new file mode 100644 index 000000000..bef3b35c4 Binary files /dev/null and b/ports/azure-c-shared-utility/no-etw-check-cmake.patch differ diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 3b95bd6dd..a8a5adc8e 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -6,19 +6,19 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1f3fd807c8c47b6607d349469301afb64643aa89 - SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 + REF 6061b6bfb035524f27d1245d63bbd825519423a9 + SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f HEAD_REF master - PATCHES no-double-expand-cmake.patch + PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1f3fd807c8c47b6607d349469301afb64643aa89 - SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 + REF 6061b6bfb035524f27d1245d63bbd825519423a9 + SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f HEAD_REF master - PATCHES no-double-expand-cmake.patch + PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch ) endif() diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 33349bef1..af84a4543 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -3,6 +3,9 @@ Version: 2019-08-20.1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services -Feature: public-preview +Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c + +Feature: use_prov_client +Description: Enables device provisioning client for DPS \ No newline at end of file diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 318856a30..c4577cf4a 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -6,22 +6,30 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc - SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f - HEAD_REF public-preview + REF b6b38ef7ca237ed526a24fafc15a9da5d8408f8a + SHA512 af014dcc0c623c03ba99bf25921833995ab041455a50b1e9b74fc39d956bb5b37fdcd246caaafa861195abd777fd9d5a15bf3f9209501bc5e65afd2671cd6cd4 + HEAD_REF public-preview-cmake_skip_default_hsm_set PATCHES improve-external-deps.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF b03cc5e0afb647934e45d4530d3e993476db3d3e - SHA512 7428c625dbacfd9ab612d5bbfad3c079074cd3834fe84a42db88e747aab2615140c0ca3035adc36b29ed8cf4bf487360522215ce03cee3e26254af925a68384a - HEAD_REF master + REF 14fe013afb4953fb0ccc1bcedad947a619677c5d + SHA512 2f52c58c2a964d4d1c9fc5c5c7048ec64bc0a74a86855ce1a228f86838aa1634f3309850988474ba3b4444dda022dbc0cc6bd3ed00bde87d1539128905495b8f + HEAD_REF cmake_skip_default_hsm_set PATCHES improve-external-deps.patch ) endif() +if("use_prov_client" IN_LIST FEATURES) + message(STATUS "use prov_client") + set(USE_PROV_CLIENT 1) +else() + message(STATUS "NO prov_client") + set(USE_PROV_CLIENT 0) +endif() + file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/) @@ -34,6 +42,8 @@ vcpkg_configure_cmake( -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON + -Duse_prov_client=${USE_PROV_CLIENT} + -Dhsm_type_symm_key=${USE_PROV_CLIENT} ) vcpkg_install_cmake() diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index 6f4713e74..907ecaff8 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-macro-utils-c - REF 17a6ad1df91e57d6981366710096798bcb5991a6 - SHA512 8f5b9561ff303832834113098a3c9eeace1f1fbbc55e508c50d0f75bfe08ee05b54a8d6a0786148c5e7861a0149317a2cc113022626f8ac72df732bda9162855 + REF 7523af934fc4d9423111e358f49b19314ec9c3e3 + SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 83bf227ab..4ddd96cf7 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8 - SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64 + REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0 + SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8 - SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64 + REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0 + SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd HEAD_REF master ) endif() -- cgit v1.2.3 From 2c738e38e6c5c635484708cfd178b705c21bf2dc Mon Sep 17 00:00:00 2001 From: John Spaith Date: Wed, 25 Sep 2019 13:11:51 -0700 Subject: Fix encoding --- ports/azure-c-shared-utility/no-etw-check-cmake.patch | Bin 1628 -> 816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ports/azure-c-shared-utility/no-etw-check-cmake.patch b/ports/azure-c-shared-utility/no-etw-check-cmake.patch index bef3b35c4..9a1ec9bd7 100644 Binary files a/ports/azure-c-shared-utility/no-etw-check-cmake.patch and b/ports/azure-c-shared-utility/no-etw-check-cmake.patch differ -- cgit v1.2.3 From a2edd08756a386d0ccb5881eb08b2473c4e85e40 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Wed, 25 Sep 2019 13:26:41 -0700 Subject: Reference correct port file --- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index a8a5adc8e..0832cec60 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -9,7 +9,7 @@ if("public-preview" IN_LIST FEATURES) REF 6061b6bfb035524f27d1245d63bbd825519423a9 SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f HEAD_REF master - PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch + PATCHES no-double-expand-cmake.patch no-etw-check-cmake.patch ) else() vcpkg_from_github( @@ -18,7 +18,7 @@ else() REF 6061b6bfb035524f27d1245d63bbd825519423a9 SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f HEAD_REF master - PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch + PATCHES no-double-expand-cmake.patch no-etw-check-cmake.patch ) endif() -- cgit v1.2.3 From 05f460b403d00e8e8e54fdbc535043e7250bcfd8 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Wed, 25 Sep 2019 22:36:07 -0700 Subject: Fix extra white space issue --- ports/azure-iot-sdk-c/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index af84a4543..5fbf1acf7 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -3,7 +3,7 @@ Version: 2019-08-20.1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services -Feature: public-preview +Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c -- cgit v1.2.3 From ba0c14d3b0083bcd455285a4d3fdba254ac3e25f Mon Sep 17 00:00:00 2001 From: John Spaith Date: Thu, 26 Sep 2019 09:43:03 -0700 Subject: Go back to older version --- ports/azure-c-shared-utility/portfile.cmake | 12 ++++++------ ports/azure-iot-sdk-c/portfile.cmake | 12 ++++++------ ports/azure-macro-utils-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/portfile.cmake | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 0832cec60..3b95bd6dd 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -6,19 +6,19 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 6061b6bfb035524f27d1245d63bbd825519423a9 - SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f + REF 1f3fd807c8c47b6607d349469301afb64643aa89 + SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 HEAD_REF master - PATCHES no-double-expand-cmake.patch no-etw-check-cmake.patch + PATCHES no-double-expand-cmake.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 6061b6bfb035524f27d1245d63bbd825519423a9 - SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f + REF 1f3fd807c8c47b6607d349469301afb64643aa89 + SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 HEAD_REF master - PATCHES no-double-expand-cmake.patch no-etw-check-cmake.patch + PATCHES no-double-expand-cmake.patch ) endif() diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index c4577cf4a..ca2b92532 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -6,18 +6,18 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF b6b38ef7ca237ed526a24fafc15a9da5d8408f8a - SHA512 af014dcc0c623c03ba99bf25921833995ab041455a50b1e9b74fc39d956bb5b37fdcd246caaafa861195abd777fd9d5a15bf3f9209501bc5e65afd2671cd6cd4 - HEAD_REF public-preview-cmake_skip_default_hsm_set + REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc + SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f + HEAD_REF public-preview PATCHES improve-external-deps.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 14fe013afb4953fb0ccc1bcedad947a619677c5d - SHA512 2f52c58c2a964d4d1c9fc5c5c7048ec64bc0a74a86855ce1a228f86838aa1634f3309850988474ba3b4444dda022dbc0cc6bd3ed00bde87d1539128905495b8f - HEAD_REF cmake_skip_default_hsm_set + REF b03cc5e0afb647934e45d4530d3e993476db3d3e + SHA512 7428c625dbacfd9ab612d5bbfad3c079074cd3834fe84a42db88e747aab2615140c0ca3035adc36b29ed8cf4bf487360522215ce03cee3e26254af925a68384a + HEAD_REF master PATCHES improve-external-deps.patch ) endif() diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index 907ecaff8..6f4713e74 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-macro-utils-c - REF 7523af934fc4d9423111e358f49b19314ec9c3e3 - SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5 + REF 17a6ad1df91e57d6981366710096798bcb5991a6 + SHA512 8f5b9561ff303832834113098a3c9eeace1f1fbbc55e508c50d0f75bfe08ee05b54a8d6a0786148c5e7861a0149317a2cc113022626f8ac72df732bda9162855 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 4ddd96cf7..f258aeb99 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0 - SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd + REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8 + SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64 HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0 - SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd + REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8 + SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64 HEAD_REF master ) endif() -- cgit v1.2.3 From 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Thu, 26 Sep 2019 10:28:03 -0700 Subject: Use patch instead of trying to jump to unapproved change in repo --- ports/azure-iot-sdk-c/cmake-hsm-option.patch | 20 ++++++++++++++++++++ ports/azure-iot-sdk-c/portfile.cmake | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/azure-iot-sdk-c/cmake-hsm-option.patch diff --git a/ports/azure-iot-sdk-c/cmake-hsm-option.patch b/ports/azure-iot-sdk-c/cmake-hsm-option.patch new file mode 100644 index 000000000..ea6af5c23 --- /dev/null +++ b/ports/azure-iot-sdk-c/cmake-hsm-option.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2c51de83..5d42dc441 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,9 +121,12 @@ if (${use_prov_client}) + set(use_prov_client_core ON) + + if ("${hsm_custom_lib}" STREQUAL "") +- set(hsm_type_x509 ON) +- set(hsm_type_sastoken ON) +- set(hsm_type_symm_key ON) ++ if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key})) ++ # If the cmake option did not explicitly configure an hsm type, then enable them all. ++ set(hsm_type_x509 ON) ++ set(hsm_type_sastoken ON) ++ set(hsm_type_symm_key ON) ++ endif() + else() + set(hsm_type_custom ON) + endif() diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index ca2b92532..e1a2d202e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -9,7 +9,7 @@ if("public-preview" IN_LIST FEATURES) REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f HEAD_REF public-preview - PATCHES improve-external-deps.patch + PATCHES improve-external-deps.patch cmake-hsm-option.patch ) else() vcpkg_from_github( -- cgit v1.2.3 From 8545a9591c67f1e59fa8790ce9338229fc7e8a09 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Thu, 10 Oct 2019 09:37:37 -0700 Subject: Backing out unneeded patch --- ports/azure-c-shared-utility/no-etw-check-cmake.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 ports/azure-c-shared-utility/no-etw-check-cmake.patch diff --git a/ports/azure-c-shared-utility/no-etw-check-cmake.patch b/ports/azure-c-shared-utility/no-etw-check-cmake.patch deleted file mode 100644 index 9a1ec9bd7..000000000 --- a/ports/azure-c-shared-utility/no-etw-check-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake -index 3947634f..60b3d2af 100644 ---- a/configs/azure_c_shared_utilityFunctions.cmake -+++ b/configs/azure_c_shared_utilityFunctions.cmake -@@ -640,7 +640,7 @@ function(set_platform_files c_shared_dir) - if(${use_condition}) - set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE) - endif() -- if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE")) -+ if(${use_etw}) - if (${use_etw} STREQUAL "ON_WITH_CONSOLE") - set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE) - set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE) -- cgit v1.2.3 From 14cc52167730025e4fd30e15640415c486594d00 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Fri, 11 Oct 2019 12:58:10 -0700 Subject: Updating control value --- ports/azure-iot-sdk-c/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 98720b665..7f8f4598b 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-iot-sdk-c -Version: 2019-10-07.1 +Version: 2019-10-11.1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services -- cgit v1.2.3