-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
[Backport 2.28] Use config.py as a module in depends.py #7104
[Backport 2.28] Use config.py as a module in depends.py #7104
Conversation
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
Requested config option can be either boolean or a string. Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
As suggested by gilles-peskine-arm. Co-authored-by: Gilles Peskine <gilles.peskine@arm.com> Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
As suggested by gilles-peskine-arm. Co-authored-by: Gilles Peskine <gilles.peskine@arm.com> Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, but I just noticed the CI has seen something I haven't, apparently something needs to change in the backport.
"""Set/unset a configuration option, optionally specifying a value. | ||
value can be either True/False (set/unset config option), or a string, | ||
which will make a symbol defined with a certain value.""" | ||
if not option_exists(conf, option): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
depends.py
in 2.28 currently relies on being able to unset an option that doesn't exist.
depends.py: Symbol MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT was not found in include/mbedtls/config.h
I think it would be best to remove the A64 symbols from the 2.28 version of the file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another good side of reusing well prepared scripts :)
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to both me and CI now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Backport consistent with the original PR.
LGTM
This is a backport of #6493.
depends.py now uses config.py to get the available configuration options as well as manipulate the config file.
Straightforward backport, the only conflicts were due to the surrounding code using
config.h
instead ofmbedtls_config.h
.