Skip to content

Commit e71ab0d

Browse files
authored
Merge pull request #12590 from devran01/importer-remove-license-file
Importer script: remove apache-2.0.txt
2 parents 3710584 + 19b208f commit e71ab0d

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

features/mbedtls/README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ For further documentation and help, you can visit the [Mbed TLS website](https:/
8585

8686
### Contributing to the project
8787

88-
We are happy to accept bug reports and contributions from the community. There are some requirements to integrate contributions:
88+
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.
8989

90-
* Simple bug fixes to existing code do not contain copyright themselves, and we can integrate without issue. The same is true of trivial contributions.
91-
* 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.
92-
93-
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.
90+
Please see the [contributing guidelines](https://github.com/ARMmbed/mbedtls/blob/development/CONTRIBUTING.md) of the project for details on how to do this.

features/mbedtls/importer/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ rsync:
6060
#
6161
# Copying licenses
6262
cp $(MBED_TLS_DIR)/LICENSE $(TARGET_PREFIX)
63-
cp $(MBED_TLS_DIR)/apache-2.0.txt $(TARGET_PREFIX)
6463
#
6564

6665
deploy: rsync
@@ -106,7 +105,6 @@ $(MBED_TLS_GIT_CFG):
106105

107106
clean:
108107
rm -f $(TARGET_PREFIX)LICENSE
109-
rm -f $(TARGET_PREFIX)apache-2.0.txt
110108
rm -f $(TARGET_PREFIX)VERSION.txt
111109
rm -f $(TARGET_PREFIX)AUTHORS.txt
112110
rm -rf $(TARGET_SRC)

features/mbedtls/mbed-crypto/importer/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ rsync:
8585
#
8686
# Copying licenses
8787
cp $(CRYPTO_DIR)/LICENSE $(TARGET_PREFIX)/
88-
cp $(CRYPTO_DIR)/apache-2.0.txt $(TARGET_PREFIX)/
8988
#
9089
# Copying Mbed Crypto into Mbed OS...
9190
rm -rf $(TARGET_SRV_IMPL)
@@ -130,7 +129,6 @@ $(CRYPTO_GIT_CFG):
130129

131130
clean:
132131
rm -f $(TARGET_PREFIX)/LICENSE
133-
rm -f $(TARGET_PREFIX)/apache-2.0.txt
134132
rm -f $(TARGET_PREFIX)/VERSION.txt
135133
rm -f $(TARGET_PREFIX)/AUTHORS.txt
136134
rm -rf $(TARGET_INC)

0 commit comments

Comments
 (0)