TA makefile updates #740
Merged
TA makefile updates #740
Conversation
This file contains 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
Rename ta/Makefile to ta/Makefile.gmake and create a symbolic link Makefile -> Makefile.gmake. The purpose is to work around an issue with the OP-TEE build system [1] which uses Buildroot and CMake to build optee_test. While doing so it overwrites ta/Makefile with Buildroot's own Makefile. This change makes sure the makefile is preserved and the build system can use $(MAKE) -f path/to/opte_test/ta/Makefile.gmake to build all the TAs at once instead of manually enumerating them [2] which is both inelegant and fragile. Link: https://github.com/OP-TEE/build/ [1] Link: https://github.com/OP-TEE/build/blob/4.2.0/br-ext/package/optee_test_ext/optee_test_ext.mk#L31-L38 [2] Signed-off-by: Jerome Forissier <[email protected]>
This was referenced Apr 17, 2024
ta/Makefile.gmake
Outdated
| define add-ta-target | ||
| .PHONY: ta-$(1) | ||
| ta-$(1): | ||
| $$(MAKE) -C $(1) |
There was a problem hiding this comment.
$(MAKE) should be enough, since we don't expect that to change.
Isn't out-dir missing?
|
Update |
jforissier
force-pushed
the
ta-makefile-updates
branch
from
9ce947f to
790d460
Compare
Replace the foreach loop in the ta target with dependencies on multiple targets (one for each TA). As a result, "make -j$(nproc) ta" will now build TAs in parallel rather than doing one after another. The O= parameter is removed because we should not override what the caller may give. Signed-off-by: Jerome Forissier <[email protected]> Acked-by: Jens Wiklander <[email protected]>
Add the GlobalPlatform Test Suite TAs to the build when GP_PACKAGE is set. This happens in the OP-TEE build environment [1], which still handles the package extraction step as well as the final installation of the TAs into the staging directory. Link: https://github.com/OP-TEE/build/blob/4.2.0/br-ext/package/optee_test_ext/optee_test_ext.mk [1] Signed-off-by: Jerome Forissier <[email protected]> Acked-by: Jens Wiklander <[email protected]>
jforissier
force-pushed
the
ta-makefile-updates
branch
from
790d460 to
b07ed3a
Compare
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.
No description provided.