Fix ordering in adjust config.sh #13191
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The config.py script that adjusts config.h in Mbed TLS doesn't handle having configurations being defined in it multiple times very well. As Mbed OS needs to have certain configurations settings based on what features are set, these code additions to config.h are moved to being added after the rest of the configuration is adjusted.
MBEDTLS_USE_PSA_CRYPTO should only be defined in Mbed OS when the appropriate Mbed OS flags are set.
0xc0170
approved these changes
Jun 25, 2020
0xc0170
added
the
release-type: patch
|
CI started |
Test run: SUCCESSSummary: 6 of 6 test jobs passed |
adbridge
added
release-version: 6.2.0
Release-pending
and removed
release-type: patch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of changes
The Mbed TLS config.py script doesn't handle having a configuration being defined in multiples places in it, which a recent change to
adjust_config.shcaused. Moving the code additions to be after all the config changes fixes the issues.MBEDTLS_USE_PSA_CRYPTOis also explicitly unset, as it should only be enabled when the appropriate Mbed OS feature flags are enabled.Impact of changes
Migration actions required
Documentation
None
Pull request type
Test results
Reviewers