From bfb0614fdbc0acbec2ebdfbd49c1b470cf3938dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Thomas?= Date: Wed, 7 Jun 2023 18:30:47 +0200 Subject: [PATCH] [nrf-ble-driver] fix version & use correct tag - Fixed version inconsistency (#28036) - Used correct tag with precompiled hex files --- ports/nrf-ble-driver/portfile.cmake | 8 ++++---- ports/nrf-ble-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nrf-ble-driver.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake index 8cd1f703a82814..ad997c97122106 100644 --- a/ports/nrf-ble-driver/portfile.cmake +++ b/ports/nrf-ble-driver/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NordicSemiconductor/pc-ble-driver - REF v4.1.4 - SHA512 8f35e757dddc27c9b11cdb3b9920562bbe09ceac715d65957e56ec8479e8ffedf12df2f976e484ed0d24b9325d9ef2b8ad6576cccefd2de8d7fa6fa8d58b03e5 + REF v${VERSION}-hex + SHA512 1e8b5882aa3754a29a8f0ec11b8e70390db7ddf7bc50e1318adaaf4cd1ba2b787129d8003f8076ad39c35ec887ef3aeadbcb23fa5100b2be24956d118370cb84 HEAD_REF master PATCHES 001-arm64-support.patch @@ -35,8 +35,8 @@ vcpkg_cmake_configure( OPTIONS -DDISABLE_EXAMPLES=ON -DDISABLE_TESTS=ON - -DNRF_BLE_DRIVER_VERSION=4.1.2 - -DCONNECTIVITY_VERSION=4.1.2 + -DNRF_BLE_DRIVER_VERSION=${VERSION} + -DCONNECTIVITY_VERSION=${VERSION} ${OPTIONS} MAYBE_UNUSED_VARIABLES DISABLE_EXAMPLES diff --git a/ports/nrf-ble-driver/vcpkg.json b/ports/nrf-ble-driver/vcpkg.json index 7db000b64b96d3..fac748f0e687e1 100644 --- a/ports/nrf-ble-driver/vcpkg.json +++ b/ports/nrf-ble-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nrf-ble-driver", "version": "4.1.4", + "port-version": 1, "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f1399507caef9e..9ef508b3403bdd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5690,7 +5690,7 @@ }, "nrf-ble-driver": { "baseline": "4.1.4", - "port-version": 0 + "port-version": 1 }, "nspr": { "baseline": "4.35", diff --git a/versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json index d7907e56dec107..5edfed930d2c72 100644 --- a/versions/n-/nrf-ble-driver.json +++ b/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eaac577bc7f0f8d3bf2cc6281f96d848937ccaa", + "version": "4.1.4", + "port-version": 1 + }, { "git-tree": "f7eb0b4a2be63dfe15611d96725869023f7b438c", "version": "4.1.4",