You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2023/08/08 14:28:09 UTC

[mynewt-nimble] branch master updated: Update missing licenses and rat excludes

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 25439ada Update missing licenses and rat excludes
25439ada is described below

commit 25439ada84ae0c94bde85af84cfb07d2fc1e3305
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Aug 7 17:55:25 2023 +0200

    Update missing licenses and rat excludes
---
 .github/workflows/compliance_check.yml                  |  5 ++---
 .rat-excludes                                           | 12 +++++-------
 LICENSE                                                 | 10 ++++++++++
 nimble/host/mesh/src/light_model.c                      |  5 +++++
 nimble/host/mesh/src/shell.h                            |  6 ++++++
 .../hci_throughput/targets/nordic_pca10040_boot/pkg.yml | 17 +++++++++++++++++
 .../targets/nordic_pca10040_boot/syscfg.yml             |  0
 .../targets/nordic_pca10040_boot/target.yml             | 17 +++++++++++++++++
 .../hci_throughput/targets/nordic_pca10056_boot/pkg.yml | 17 +++++++++++++++++
 .../targets/nordic_pca10056_boot/syscfg.yml             |  0
 .../targets/nordic_pca10056_boot/target.yml             | 17 +++++++++++++++++
 11 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compliance_check.yml b/.github/workflows/compliance_check.yml
index edacc93f..b73142ab 100644
--- a/.github/workflows/compliance_check.yml
+++ b/.github/workflows/compliance_check.yml
@@ -50,9 +50,8 @@ jobs:
         run: |
              mkdir repos
              git clone --depth=1 https://github.com/apache/mynewt-core repos/apache-mynewt-core
-             wget https://dlcdn.apache.org//creadur/apache-rat-0.15/apache-rat-0.15-bin.tar.gz
-             tar zxf apache-rat-0.15-bin.tar.gz apache-rat-0.15/apache-rat-0.15.jar
-             mv apache-rat-0.15/apache-rat-0.15.jar apache-rat.jar
+             wget https://repository.apache.org/content/repositories/snapshots/org/apache/rat/apache-rat/0.16-SNAPSHOT/apache-rat-0.16-20230807.065048-315.jar
+             mv apache-rat-0.16-20230807.065048-315.jar apache-rat.jar
       - name: check licensing
         run: |
              ./repos/apache-mynewt-core/.github/check_license.py
diff --git a/.rat-excludes b/.rat-excludes
index a4bcb91b..f29a97eb 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -17,21 +17,19 @@ pts-sm.txt
 uncrustify.cfg
 .style_ignored_dirs
 .mailmap
+requirements.txt
 
 # tinycrypt - BSD License.
 tinycrypt
 
-# Bluetooth Mesh - Apache 2.0 License
-mesh
-
 # Queue implementation - BSD License
 queue.h
 
 # mbuf implementation - BSD License
 os_mbuf.c
 
-# Bluetooth Mesh badge sample - Apache 2.0 License
-mesh_badge
+# Nordic nRF5 SDK - BSD License
+system_nrf52.c
 
-#BabbleSim and EDDT - Apache 2.0 License
-babblesim
+# CMSIS-CORE - BSD License.
+cmsis_nvic.h
diff --git a/LICENSE b/LICENSE
index 08b9b218..960e8257 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,3 +215,13 @@ under the following license:
 This product bundles tinycrypt, which is available under the "3-clause BSD"
 license. For details, and bundled files see:
     * ext/tinycrypt/LICENSE
+
+This product bundles and partly derives from parts of the Nordic nRF52 SDK,
+which are available under a BSD style license.  Relevant files are:
+    * babblesim/hw/mcu/nordic/nrf52_bsim/src/system_nrf52.c
+
+This product bundles additional files from CMSIS-CORE, but these files are
+missing licensing information.  The BSD license was subsequently added to
+these files in later releases.  These files are:
+    * babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/cmsis_nvic.h
+
diff --git a/nimble/host/mesh/src/light_model.c b/nimble/host/mesh/src/light_model.c
index e7199519..5f0af485 100644
--- a/nimble/host/mesh/src/light_model.c
+++ b/nimble/host/mesh/src/light_model.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "syscfg/syscfg.h"
 
diff --git a/nimble/host/mesh/src/shell.h b/nimble/host/mesh/src/shell.h
index 53cc83a2..98d3f8c6 100644
--- a/nimble/host/mesh/src/shell.h
+++ b/nimble/host/mesh/src/shell.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2017 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #ifndef __SHELL_H__
 #define __SHELL_H__
 
diff --git a/tools/hci_throughput/targets/nordic_pca10040_boot/pkg.yml b/tools/hci_throughput/targets/nordic_pca10040_boot/pkg.yml
index dfcb1b63..b4f0ee6c 100644
--- a/tools/hci_throughput/targets/nordic_pca10040_boot/pkg.yml
+++ b/tools/hci_throughput/targets/nordic_pca10040_boot/pkg.yml
@@ -1,3 +1,20 @@
+# 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.
+
 pkg.name: targets/nordic_pca10040_boot
 pkg.type: target
 pkg.description:
diff --git a/tools/hci_throughput/targets/nordic_pca10040_boot/syscfg.yml b/tools/hci_throughput/targets/nordic_pca10040_boot/syscfg.yml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tools/hci_throughput/targets/nordic_pca10040_boot/target.yml b/tools/hci_throughput/targets/nordic_pca10040_boot/target.yml
index bbf25314..ad6f05a3 100644
--- a/tools/hci_throughput/targets/nordic_pca10040_boot/target.yml
+++ b/tools/hci_throughput/targets/nordic_pca10040_boot/target.yml
@@ -1,3 +1,20 @@
+# 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.
+
 target.app: "@mcuboot/boot/mynewt"
 target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10040"
 target.build_profile: optimized
diff --git a/tools/hci_throughput/targets/nordic_pca10056_boot/pkg.yml b/tools/hci_throughput/targets/nordic_pca10056_boot/pkg.yml
index 1b9a6cde..5546afa8 100644
--- a/tools/hci_throughput/targets/nordic_pca10056_boot/pkg.yml
+++ b/tools/hci_throughput/targets/nordic_pca10056_boot/pkg.yml
@@ -1,3 +1,20 @@
+# 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.
+
 pkg.name: targets/nordic_pca10056_boot
 pkg.type: target
 pkg.description:
diff --git a/tools/hci_throughput/targets/nordic_pca10056_boot/syscfg.yml b/tools/hci_throughput/targets/nordic_pca10056_boot/syscfg.yml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tools/hci_throughput/targets/nordic_pca10056_boot/target.yml b/tools/hci_throughput/targets/nordic_pca10056_boot/target.yml
index 9cde39ac..ff3aec12 100644
--- a/tools/hci_throughput/targets/nordic_pca10056_boot/target.yml
+++ b/tools/hci_throughput/targets/nordic_pca10056_boot/target.yml
@@ -1,3 +1,20 @@
+# 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.
+
 target.app: "@mcuboot/boot/mynewt"
 target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10056"
 target.build_profile: optimized