Skip to content

Importer script: remove apache-2.0.txt #12590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 9, 2020
Merged

Importer script: remove apache-2.0.txt #12590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4773a21
tls: Remove apache-2.0.txt from importer script
urutva Mar 6, 2020
19b208f
Update the contribution guidelines for Mbed TLS
simonbutcher Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions features/mbedtls/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ For further documentation and help, you can visit the [Mbed TLS website](https:/

### Contributing to the project

We are happy to accept bug reports and contributions from the community. There are some requirements to integrate contributions:
We gratefully accept bug reports and contributions from the community. Contributions should be submitted to the [standalone Mbed TLS project](https://github.com/ARMmbed/mbedtls), not to the version of Mbed TLS embedded within Mbed OS.

* Simple bug fixes to existing code do not contain copyright themselves, and we can integrate without issue. The same is true of trivial contributions.
* For larger contributions, such as a new feature, the code can possibly fall under copyright law. We then need your consent to share in the ownership of the copyright. We have a form for this, which we will send to you if you submit a contribution or pull request that we deem this necessary for.

Please submit contributions to the [standalone Mbed TLS project](https://github.com/ARMmbed/mbedtls), not to the version of Mbed TLS embedded within Mbed OS.
Please see the [contributing guidelines](https://github.com/ARMmbed/mbedtls/blob/development/CONTRIBUTING.md) of the project for details on how to do this.
2 changes: 0 additions & 2 deletions features/mbedtls/importer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ rsync:
#
# Copying licenses
cp $(MBED_TLS_DIR)/LICENSE $(TARGET_PREFIX)
cp $(MBED_TLS_DIR)/apache-2.0.txt $(TARGET_PREFIX)
#

deploy: rsync
Expand Down Expand Up @@ -106,7 +105,6 @@ $(MBED_TLS_GIT_CFG):

clean:
rm -f $(TARGET_PREFIX)LICENSE
rm -f $(TARGET_PREFIX)apache-2.0.txt
rm -f $(TARGET_PREFIX)VERSION.txt
rm -f $(TARGET_PREFIX)AUTHORS.txt
rm -rf $(TARGET_SRC)
Expand Down
2 changes: 0 additions & 2 deletions features/mbedtls/mbed-crypto/importer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ rsync:
#
# Copying licenses
cp $(CRYPTO_DIR)/LICENSE $(TARGET_PREFIX)/
cp $(CRYPTO_DIR)/apache-2.0.txt $(TARGET_PREFIX)/
#
# Copying Mbed Crypto into Mbed OS...
rm -rf $(TARGET_SRV_IMPL)
Expand Down Expand Up @@ -130,7 +129,6 @@ $(CRYPTO_GIT_CFG):

clean:
rm -f $(TARGET_PREFIX)/LICENSE
rm -f $(TARGET_PREFIX)/apache-2.0.txt
rm -f $(TARGET_PREFIX)/VERSION.txt
rm -f $(TARGET_PREFIX)/AUTHORS.txt
rm -rf $(TARGET_INC)
Expand Down