From 417979f8809c61c4921bfab1e184b32d292b5a76 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 24 Jan 2019 18:22:32 +0000 Subject: [PATCH 1/9] readme: add list of licenses - not Apache 2.0 Name all folders containing different liceses. Any new file not Apache 2.0 should be captured here. --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 59d8fcc7e3..075350c5fb 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,28 @@ The software is provided under [Apache-2.0 license](LICENSE). Contributions to t This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html) +Folders containing files not under Apache 2.0 as listed above. The original license text is included in those source files. + +- cmsis - MIT/BSD-3-Clause +- components/802.15.4_RF/mcr20a-rf-driver - BSD-3-Clause +- features/cryptocell/FEATURE_CRYPTOCELL310 - BSD-style +- features/FEATURE_BOOTLOADER - PBL +- features/FEATURE_BLE/targets - BSD-style/PBL/MIT +- features/lorawan - Revised BSD +- features/lwipstack - BSD-3-Clause/MIT +- features/nanostack/sal-stack-nanostack - BSD-3-Clause +- features/storage/FEATURE_STORAGE - BSD-style +- features/storage/blockdevice - MIT +- features/storage/filesystem/littlefs - BSD-3-Clause +- features/storage/filesystem/fat - MIT/BSD-style +- features/netsocket/emac-drivers - BSD-3-Clause +- features/frameworks/unity/unity - MIT +- rtos - MIT +- drivers - MIT +- TESTS/mbed_hal/trng/pithy - BSD-3-Clause +- tools/data/rpc - MIT +- targets - PBL/BSD-style/MIT/Zlib + ## Getting started for developers We have a [developer website](https://os.mbed.com) for asking questions, engaging with others, finding information on boards and components, using an online IDE and compiler, reading the documentation and learning about what's new and what's coming next in Mbed OS. From bec003353d4a220abc45af9c99506588beb43667 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Tue, 12 Feb 2019 10:13:32 +0000 Subject: [PATCH 2/9] readme: license update Fix licenses based on latest Fossology scan. Using -style licenses for specific type licenses Add paths to the readme. --- README.md | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 075350c5fb..da335abb13 100644 --- a/README.md +++ b/README.md @@ -33,27 +33,28 @@ The software is provided under [Apache-2.0 license](LICENSE). Contributions to t This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html) -Folders containing files not under Apache 2.0 as listed above. The original license text is included in those source files. +Folders containing files not under Apache 2.0 as listed above (each folder should contain own README file with license specified for its files). The original license text is included in those source files. -- cmsis - MIT/BSD-3-Clause -- components/802.15.4_RF/mcr20a-rf-driver - BSD-3-Clause -- features/cryptocell/FEATURE_CRYPTOCELL310 - BSD-style -- features/FEATURE_BOOTLOADER - PBL -- features/FEATURE_BLE/targets - BSD-style/PBL/MIT -- features/lorawan - Revised BSD -- features/lwipstack - BSD-3-Clause/MIT -- features/nanostack/sal-stack-nanostack - BSD-3-Clause -- features/storage/FEATURE_STORAGE - BSD-style -- features/storage/blockdevice - MIT -- features/storage/filesystem/littlefs - BSD-3-Clause -- features/storage/filesystem/fat - MIT/BSD-style -- features/netsocket/emac-drivers - BSD-3-Clause -- features/frameworks/unity/unity - MIT -- rtos - MIT -- drivers - MIT -- TESTS/mbed_hal/trng/pithy - BSD-3-Clause -- tools/data/rpc - MIT -- targets - PBL/BSD-style/MIT/Zlib +- [cmsis](./cmsis) - MIT, BSD-3-Clause +- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause +- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License +- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL +- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style +- [features/lorawan](./features/lorawan) - Revised BSD +- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style +- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause +- [features/storage/FEATURE_STORAGE](./features/storage/FEATURE_STORAGE) - BSD-style +- [features/storage/blockdevice](./features/storage/blockdevice) - MIT +- [features/storage/filesystem/littlefs](./features/storage/filesystem/littlefs) - BSD-3-Clause +- [features/storage/filesystem/fat](./features/storage/filesystem/fat) - MIT, BSD-style +- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style +- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT +- [features/unsupported](./features/unsupported) - MIT-style, BSD-style +- [rtos](./rtos) - MIT +- [drivers](./drivers) - MIT +- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause +- [tools/data/rpc](./tools/data/rpc) - MIT +- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain ## Getting started for developers From 9de5297bcaa26c4d8d8f8654f5982f6be4e8ab8e Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Tue, 12 Feb 2019 10:21:55 +0000 Subject: [PATCH 3/9] readme: storage license under one folder --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index da335abb13..13b277e6d6 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,7 @@ Folders containing files not under Apache 2.0 as listed above (each folder shoul - [features/lorawan](./features/lorawan) - Revised BSD - [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style - [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause -- [features/storage/FEATURE_STORAGE](./features/storage/FEATURE_STORAGE) - BSD-style -- [features/storage/blockdevice](./features/storage/blockdevice) - MIT -- [features/storage/filesystem/littlefs](./features/storage/filesystem/littlefs) - BSD-3-Clause -- [features/storage/filesystem/fat](./features/storage/filesystem/fat) - MIT, BSD-style +- [features/storage](./features/storage) - BSD-style, MIT - [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT - [features/unsupported](./features/unsupported) - MIT-style, BSD-style From 2cde31c3f3eea2cc1fa5a23d1c2142a3cfcb3a78 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Wed, 13 Feb 2019 11:25:59 +0000 Subject: [PATCH 4/9] license: rename to apache 2.0 txt file --- LICENSE => LICENSE-apache-2.0.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE => LICENSE-apache-2.0.txt (100%) diff --git a/LICENSE b/LICENSE-apache-2.0.txt similarity index 100% rename from LICENSE rename to LICENSE-apache-2.0.txt From 49d6dd8a680970e09433843bac85f2df19d0daf4 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Wed, 13 Feb 2019 11:29:46 +0000 Subject: [PATCH 5/9] license: add license file containing folders with non apache license --- LICENSE | 22 ++++++++++++++++++++++ README.md | 22 ++-------------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..efda07b093 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, +as can be found in: LICENSE-apache-2.0.txt + +Folders containing files under different permissive license than Apache 2.0 are listed below. Eeach folder should contain own README file with license specified for its files. The original license text is included in those source files. + +- [cmsis](./cmsis) - MIT, BSD-3-Clause +- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause +- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License +- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL +- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style +- [features/lorawan](./features/lorawan) - Revised BSD +- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style +- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause +- [features/storage](./features/storage) - BSD-style, MIT +- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style +- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT +- [features/unsupported](./features/unsupported) - MIT-style, BSD-style +- [rtos](./rtos) - MIT +- [drivers](./drivers) - MIT +- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause +- [tools/data/rpc](./tools/data/rpc) - MIT +- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain diff --git a/README.md b/README.md index 13b277e6d6..308b66860e 100644 --- a/README.md +++ b/README.md @@ -29,29 +29,11 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo ## License and contributions -The software is provided under [Apache-2.0 license](LICENSE). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. +The software is provided under [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html) -Folders containing files not under Apache 2.0 as listed above (each folder should contain own README file with license specified for its files). The original license text is included in those source files. - -- [cmsis](./cmsis) - MIT, BSD-3-Clause -- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause -- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License -- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL -- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style -- [features/lorawan](./features/lorawan) - Revised BSD -- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style -- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause -- [features/storage](./features/storage) - BSD-style, MIT -- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style -- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT -- [features/unsupported](./features/unsupported) - MIT-style, BSD-style -- [rtos](./rtos) - MIT -- [drivers](./drivers) - MIT -- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause -- [tools/data/rpc](./tools/data/rpc) - MIT -- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain +Folders containing files under different permissive license than Apache 2.0 are listed in LICENSE file. ## Getting started for developers From 7b3feea4808b8857c52854ecab0e9ea4937ef61b Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Wed, 13 Feb 2019 14:06:49 +0000 Subject: [PATCH 6/9] readme: license file reference fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 308b66860e..970aeb1331 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The software is provided under [Apache-2.0 license](LICENSE-apache-2.0.txt). Con This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html) -Folders containing files under different permissive license than Apache 2.0 are listed in LICENSE file. +Folders containing files under different permissive license than Apache 2.0 are listed in [LICENSE](LICENSE) file. ## Getting started for developers From 1e43cdf455b141c2508bcd4be3b180f2bd27e4c3 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 14 Feb 2019 10:39:14 +0000 Subject: [PATCH 7/9] readme: fix space and . in license --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 970aeb1331..3e3d985518 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo ## License and contributions -The software is provided under [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. +The software is provided under [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. -This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html) +This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html). Folders containing files under different permissive license than Apache 2.0 are listed in [LICENSE](LICENSE) file. From e0aa9c5a4694840176b2adf2f2499c8127466cc1 Mon Sep 17 00:00:00 2001 From: Amanda Butler Date: Fri, 15 Feb 2019 13:58:14 -0600 Subject: [PATCH 8/9] Fix typo in LICENSE Fix typo as requested in comments. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index efda07b093..4522260636 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: LICENSE-apache-2.0.txt -Folders containing files under different permissive license than Apache 2.0 are listed below. Eeach folder should contain own README file with license specified for its files. The original license text is included in those source files. +Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files. - [cmsis](./cmsis) - MIT, BSD-3-Clause - [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause From 4aaf3e4dec01396306e1499410bb8aefb956cf56 Mon Sep 17 00:00:00 2001 From: Amanda Butler Date: Fri, 15 Feb 2019 14:05:29 -0600 Subject: [PATCH 9/9] Add articles to README.md Include articles for clarity. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3e3d985518..bed98b0caf 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,11 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo ## License and contributions -The software is provided under [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. +The software is provided under the [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more information. This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html). -Folders containing files under different permissive license than Apache 2.0 are listed in [LICENSE](LICENSE) file. +Folders containing files under different permissive license than Apache 2.0 are listed in the [LICENSE](LICENSE) file. ## Getting started for developers