From 210d62470c7193a70221ce0ed7edf91bb565cc39 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Wed, 20 Dec 2017 14:33:54 +0100 Subject: [PATCH] nimble: Make this proper external repository --- nimble/controller/pkg.yml | 6 +++--- nimble/controller/test/pkg.yml | 14 ++++++------- nimble/drivers/native/pkg.yml | 4 ++-- nimble/drivers/nrf51/pkg.yml | 6 +++--- nimble/drivers/nrf52/pkg.yml | 6 +++--- nimble/host/mesh/pkg.yml | 12 +++++------ nimble/host/pkg.yml | 16 +++++++-------- nimble/host/services/ans/pkg.yml | 4 ++-- nimble/host/services/bleuart/pkg.yml | 6 +++--- nimble/host/services/gap/pkg.yml | 4 ++-- nimble/host/services/gatt/pkg.yml | 4 ++-- nimble/host/services/ias/pkg.yml | 4 ++-- nimble/host/services/lls/pkg.yml | 4 ++-- nimble/host/services/tps/pkg.yml | 4 ++-- nimble/host/store/config/pkg.yml | 8 ++++---- nimble/host/store/ram/pkg.yml | 4 ++-- nimble/host/test/pkg.yml | 16 +++++++-------- nimble/host/util/pkg.yml | 4 ++-- nimble/pkg.yml | 4 ++-- nimble/transport/emspi/pkg.yml | 6 +++--- nimble/transport/pkg.yml | 14 ++++++------- nimble/transport/ram/pkg.yml | 6 +++--- nimble/transport/socket/pkg.yml | 10 +++++----- nimble/transport/uart/pkg.yml | 10 +++++----- repository.yml | 30 ++++++++++++++++++++++++++++ 25 files changed, 118 insertions(+), 88 deletions(-) create mode 100644 repository.yml diff --git a/nimble/controller/pkg.yml b/nimble/controller/pkg.yml index fa5011818..8ccb9f8c9 100644 --- a/nimble/controller/pkg.yml +++ b/nimble/controller/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/controller +pkg.name: nimble/controller pkg.description: Controller side of the nimble Bluetooth Smart stack. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -31,8 +31,8 @@ pkg.req_apis: - stats pkg.deps: - - kernel/os - - net/nimble + - "@apache-mynewt-core/kernel/os" + - nimble pkg.init: ble_ll_init: 250 diff --git a/nimble/controller/test/pkg.yml b/nimble/controller/test/pkg.yml index c345c1383..ab1d9dbaf 100644 --- a/nimble/controller/test/pkg.yml +++ b/nimble/controller/test/pkg.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. # -pkg.name: net/nimble/controller/test +pkg.name: nimble/controller/test pkg.type: unittest pkg.description: "NimBLE controller unit tests." pkg.author: "Apache Mynewt " @@ -23,11 +23,11 @@ pkg.homepage: "http://mynewt.apache.org/" pkg.keywords: pkg.deps: - - test/testutil - - net/nimble/controller + - "@apache-mynewt-core/test/testutil" + - nimble/controller pkg.deps.SELFTEST: - - sys/console/stub - - sys/log/full - - sys/stats/stub - - net/nimble/transport/ram + - "@apache-mynewt-core/sys/console/stub" + - "@apache-mynewt-core/sys/log/full" + - "@apache-mynewt-core/sys/stats/stub" + - nimble/transport/ram diff --git a/nimble/drivers/native/pkg.yml b/nimble/drivers/native/pkg.yml index f57af6272..879589865 100644 --- a/nimble/drivers/native/pkg.yml +++ b/nimble/drivers/native/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: hw/drivers/nimble/native +pkg.name: nimble/drivers/native pkg.description: BLE driver for simulations. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -27,4 +27,4 @@ pkg.keywords: pkg.apis: ble_driver pkg.deps: - - net/nimble/controller + - nimble/controller diff --git a/nimble/drivers/nrf51/pkg.yml b/nimble/drivers/nrf51/pkg.yml index 6c427b54f..5f17d6fae 100644 --- a/nimble/drivers/nrf51/pkg.yml +++ b/nimble/drivers/nrf51/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: hw/drivers/nimble/nrf51 +pkg.name: nimble/drivers/nrf51 pkg.description: BLE driver for nRF51 systems. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -27,5 +27,5 @@ pkg.keywords: pkg.apis: ble_driver pkg.deps: - - net/nimble - - net/nimble/controller + - nimble + - nimble/controller diff --git a/nimble/drivers/nrf52/pkg.yml b/nimble/drivers/nrf52/pkg.yml index f6826672d..180919cbb 100644 --- a/nimble/drivers/nrf52/pkg.yml +++ b/nimble/drivers/nrf52/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: hw/drivers/nimble/nrf52 +pkg.name: nimble/drivers/nrf52 pkg.description: BLE driver for nRF52 systems. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -27,5 +27,5 @@ pkg.keywords: pkg.apis: ble_driver pkg.deps: - - net/nimble - - net/nimble/controller + - nimble + - nimble/controller diff --git a/nimble/host/mesh/pkg.yml b/nimble/host/mesh/pkg.yml index 3e1be0e0c..19fb91d64 100644 --- a/nimble/host/mesh/pkg.yml +++ b/nimble/host/mesh/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/mesh +pkg.name: nimble/host/mesh pkg.description: Bluetooth Mesh pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -27,11 +27,11 @@ pkg.keywords: - mesh pkg.deps: - - kernel/os - - net/nimble - - util/mem - - net/nimble/host - - crypto/tinycrypt + - "@apache-mynewt-core/kernel/os" + - "@apache-mynewt-core/util/mem" + - "@apache-mynewt-core/crypto/tinycrypt" + - nimble + - nimble/host pkg.deps.BLE_MESH_SHELL: - sys/shell diff --git a/nimble/host/pkg.yml b/nimble/host/pkg.yml index 4affd38ce..f939b8e6e 100644 --- a/nimble/host/pkg.yml +++ b/nimble/host/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host +pkg.name: nimble/host pkg.description: Host side of the nimble Bluetooth Smart stack. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,21 +26,21 @@ pkg.keywords: - bluetooth pkg.deps: - - kernel/os - - net/nimble - - util/mem + - "@apache-mynewt-core/kernel/os" + - "@apache-mynewt-core/util/mem" + - nimble pkg.deps.BLE_SM_LEGACY: - - crypto/tinycrypt + - "@apache-mynewt-core/crypto/tinycrypt" pkg.deps.BLE_SM_SC: - - crypto/tinycrypt + - "@apache-mynewt-core/crypto/tinycrypt" pkg.deps.BLE_MONITOR_RTT: - - hw/drivers/rtt + - "@apache-mynewt-core/hw/drivers/rtt" pkg.deps.BLE_MESH: - - net/nimble/host/mesh + - nimble/host/mesh pkg.req_apis: - ble_transport diff --git a/nimble/host/services/ans/pkg.yml b/nimble/host/services/ans/pkg.yml index 345c93b68..671791d55 100644 --- a/nimble/host/services/ans/pkg.yml +++ b/nimble/host/services/ans/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/ans +pkg.name: nimble/host/services/ans pkg.description: Alert Notification Service Server. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - nimble pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_ans_init: 303 diff --git a/nimble/host/services/bleuart/pkg.yml b/nimble/host/services/bleuart/pkg.yml index a357d3738..56fbffbbc 100644 --- a/nimble/host/services/bleuart/pkg.yml +++ b/nimble/host/services/bleuart/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/bleuart +pkg.name: nimble/host/services/bleuart pkg.description: BLE uart service. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -27,8 +27,8 @@ pkg.keywords: - uart pkg.deps: - - kernel/os - - net/nimble/host + - "@apache-mynewt-core/kernel/os" + - nimble/host pkg.req_apis: - console diff --git a/nimble/host/services/gap/pkg.yml b/nimble/host/services/gap/pkg.yml index c68acea25..1ff5534e7 100644 --- a/nimble/host/services/gap/pkg.yml +++ b/nimble/host/services/gap/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/gap +pkg.name: nimble/host/services/gap pkg.description: Implements the GAP Service. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - gap pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_gap_init: 301 diff --git a/nimble/host/services/gatt/pkg.yml b/nimble/host/services/gatt/pkg.yml index 8af1c9eee..6f027dcb6 100644 --- a/nimble/host/services/gatt/pkg.yml +++ b/nimble/host/services/gatt/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/gatt +pkg.name: nimble/host/services/gatt pkg.description: Implements the GATT service. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - gatt pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_gatt_init: 302 diff --git a/nimble/host/services/ias/pkg.yml b/nimble/host/services/ias/pkg.yml index 0af4d5c07..26ff1fba0 100644 --- a/nimble/host/services/ias/pkg.yml +++ b/nimble/host/services/ias/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/ias +pkg.name: nimble/host/services/ias pkg.description: Immidiate Alert Service Implementation. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - nimble pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_ias_init: 303 diff --git a/nimble/host/services/lls/pkg.yml b/nimble/host/services/lls/pkg.yml index bab70ff0c..d78493f64 100644 --- a/nimble/host/services/lls/pkg.yml +++ b/nimble/host/services/lls/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/lls +pkg.name: nimble/host/services/lls pkg.description: Link Loss Service Implementation. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - nimble pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_lls_init: 303 diff --git a/nimble/host/services/tps/pkg.yml b/nimble/host/services/tps/pkg.yml index 821d389dd..e9641b337 100644 --- a/nimble/host/services/tps/pkg.yml +++ b/nimble/host/services/tps/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/services/tps +pkg.name: nimble/host/services/tps pkg.description: Tx Power Service adopted specification. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,7 +28,7 @@ pkg.keywords: - nimble pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_svc_tps_init: 303 diff --git a/nimble/host/store/config/pkg.yml b/nimble/host/store/config/pkg.yml index 9fb513fe4..ae5d428c0 100644 --- a/nimble/host/store/config/pkg.yml +++ b/nimble/host/store/config/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/store/config +pkg.name: nimble/host/store/config pkg.description: sys/config-based persistence layer for the NimBLE host. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -28,11 +28,11 @@ pkg.keywords: - persistence pkg.deps: - - encoding/base64 - - net/nimble/host + - "@apache-mynewt-core/encoding/base64" + - nimble/host pkg.deps.BLE_STORE_CONFIG_PERSIST: - - sys/config + - "@apache-mynewt-core/sys/config" pkg.init: ble_store_config_init: 500 diff --git a/nimble/host/store/ram/pkg.yml b/nimble/host/store/ram/pkg.yml index f771605a9..2f1b4ee24 100644 --- a/nimble/host/store/ram/pkg.yml +++ b/nimble/host/store/ram/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/store/ram +pkg.name: nimble/host/store/ram pkg.description: > DEPRECATED; for a RAM-only BLE store, use store/config and set BLE_STORE_CONFIG_PERSIST to 0. RAM-based persistence layer for the NimBLE @@ -31,7 +31,7 @@ pkg.keywords: - persistence pkg.deps: - - net/nimble/host + - nimble/host pkg.init: ble_store_ram_init: 500 diff --git a/nimble/host/test/pkg.yml b/nimble/host/test/pkg.yml index b5e39f262..e0f273d9e 100644 --- a/nimble/host/test/pkg.yml +++ b/nimble/host/test/pkg.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. # -pkg.name: net/nimble/host/test +pkg.name: nimble/host/test pkg.type: unittest pkg.description: "NimBLE host unit tests." pkg.author: "Apache Mynewt " @@ -23,12 +23,12 @@ pkg.homepage: "http://mynewt.apache.org/" pkg.keywords: pkg.deps: - - test/testutil - - net/nimble/host - - net/nimble/host/store/config + - "@apache-mynewt-core/test/testutil" + - nimble/host + - nimble/host/store/config pkg.deps.SELFTEST: - - sys/console/stub - - sys/log/full - - sys/stats/stub - - net/nimble/transport/ram + - "@apache-mynewt-core/sys/console/stub" + - "@apache-mynewt-core/sys/log/full" + - "@apache-mynewt-core/sys/stats/stub" + - nimble/transport/ram diff --git a/nimble/host/util/pkg.yml b/nimble/host/util/pkg.yml index 3c4b373ff..b80dbeaeb 100644 --- a/nimble/host/util/pkg.yml +++ b/nimble/host/util/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/host/util +pkg.name: nimble/host/util pkg.description: Supplementary utilities for the NimBLE host pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,4 +26,4 @@ pkg.keywords: - bluetooth pkg.deps: - - net/nimble/host + - nimble/host diff --git a/nimble/pkg.yml b/nimble/pkg.yml index 6136d981f..2c54d1f56 100644 --- a/nimble/pkg.yml +++ b/nimble/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble +pkg.name: nimble pkg.description: Generic functionality for the nimble Bluetooth Smart stack; used by both the controller and the host. pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,4 +26,4 @@ pkg.keywords: - bluetooth pkg.deps: - - kernel/os + - "@apache-mynewt-core/kernel/os" diff --git a/nimble/transport/emspi/pkg.yml b/nimble/transport/emspi/pkg.yml index a1f651172..479bdc5c7 100644 --- a/nimble/transport/emspi/pkg.yml +++ b/nimble/transport/emspi/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/transport/emspi +pkg.name: nimble/transport/emspi pkg.description: "HCI transport using EM's HCI SPI protocol." pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,8 +26,8 @@ pkg.keywords: - bluetooth pkg.deps: - - net/nimble - - kernel/os + - "@apache-mynewt-core/kernel/os" + - nimble pkg.apis: - ble_transport diff --git a/nimble/transport/pkg.yml b/nimble/transport/pkg.yml index 3a59081f9..e2d95487f 100644 --- a/nimble/transport/pkg.yml +++ b/nimble/transport/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/transport +pkg.name: nimble/transport pkg.description: Meta-package for NimBLE HCI transport pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,17 +26,17 @@ pkg.keywords: - bluetooth pkg.deps.BLE_HCI_TRANSPORT_NIMBLE_BUILTIN: - - net/nimble/transport/ram - - net/nimble/controller + - nimble/transport/ram + - nimble/controller pkg.deps.BLE_HCI_TRANSPORT_EMSPI: - - net/nimble/transport/emspi + - nimble/transport/emspi pkg.deps.BLE_HCI_TRANSPORT_RAM: - - net/nimble/transport/ram + - nimble/transport/ram pkg.deps.BLE_HCI_TRANSPORT_SOCKET: - - net/nimble/transport/socket + - nimble/transport/socket pkg.deps.BLE_HCI_TRANSPORT_UART: - - net/nimble/transport/uart + - nimble/transport/uart diff --git a/nimble/transport/ram/pkg.yml b/nimble/transport/ram/pkg.yml index c340cee77..a9d46a7b9 100644 --- a/nimble/transport/ram/pkg.yml +++ b/nimble/transport/ram/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/transport/ram +pkg.name: nimble/transport/ram pkg.description: XXX pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,8 +26,8 @@ pkg.keywords: - bluetooth pkg.deps: - - net/nimble - - kernel/os + - "@apache-mynewt-core/kernel/os" + - nimble pkg.apis: - ble_transport diff --git a/nimble/transport/socket/pkg.yml b/nimble/transport/socket/pkg.yml index 75ef04ced..11a94fedd 100644 --- a/nimble/transport/socket/pkg.yml +++ b/nimble/transport/socket/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/transport/socket +pkg.name: nimble/transport/socket pkg.description: Provides HCI transport over socket interface pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,10 +26,10 @@ pkg.keywords: - bluetooth pkg.deps: - - hw/hal - - kernel/os - - net/nimble - - util/mem + - "@apache-mynewt-core/hw/hal" + - "@apache-mynewt-core/kernel/os" + - "@apache-mynewt-core/util/mem" + - nimble pkg.apis: - ble_transport diff --git a/nimble/transport/uart/pkg.yml b/nimble/transport/uart/pkg.yml index 2419fa377..f281b6400 100644 --- a/nimble/transport/uart/pkg.yml +++ b/nimble/transport/uart/pkg.yml @@ -17,7 +17,7 @@ # under the License. # -pkg.name: net/nimble/transport/uart +pkg.name: nimble/transport/uart pkg.description: XXX pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" @@ -26,10 +26,10 @@ pkg.keywords: - bluetooth pkg.deps: - - hw/hal - - kernel/os - - net/nimble - - util/mem + - "@apache-mynewt-core/hw/hal" + - "@apache-mynewt-core/kernel/os" + - "@apache-mynewt-core/util/mem" + - nimble pkg.apis: - ble_transport diff --git a/repository.yml b/repository.yml new file mode 100644 index 000000000..ba9fea184 --- /dev/null +++ b/repository.yml @@ -0,0 +1,30 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +repo.name: apache-mynewt-nimble +repo.versions: + "0.0.0": "master" + + "0-dev": "0.0.0" + "0-latest": "0.0.0" + +repo.newt_compatibility: + 0.0.0: + 1.1.0: good +