Fix imgtool import for CYTFM_064B0S2_4343W signing #14362
Merged
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
|
@LDong-Arm, thank you for your changes. |
|
@LDong-Arm, thank you for your changes. |
hugueskamba
approved these changes
Mar 2, 2021
|
The scripts have been frozen you may want to add @Patater and @rwalton-arm as reviewers. |
Patater
reviewed
Mar 2, 2021
|
@hugueskamba @Patater Thanks for the review, we're waiting for #14354 to get in to rebase this PR |
Fixes: ARMmbed#14153 The target CYTFM_064B0S2_4343W is signed using `cysecuretools` which depends on `imgtool` managed by `pip`. However, Arm Musca targets requires a modified/wrapped version of the image tool copied from trusted-firmware-m + MCUboot. To avoid conflicts in the version of `imgtool` used, we should only add the copied version of `imgtool` to python's system path for Musca targets instead of doing it globally for all targets.
LDong-Arm
force-pushed
the
cypress_signing_fix
branch
from
1e1c649
to
5ef82f5
Compare
|
Rebased and retargeted to the master branch. |
0xc0170
approved these changes
Mar 3, 2021
Patater
approved these changes
Mar 3, 2021
|
CI restarted |
Jenkins CI Test : ❌ FAILEDBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
|
@LDong-Arm looks like we may have some genuine failures |
Jenkins CI Test : ❌ FAILEDBuild Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
|
@adbridge It's still a CI issue. From the log: This path to |
Jenkins CI Test : ✔️ SUCCESSBuild Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
|
This is ready for merge, as we are making an exception for the Travis frozen tools. |
0xc0170
added
ready for merge
release-type: patch
This was referenced Mar 12, 2021
mbedmain
added
release-version: 6.9.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
Fixes: #14153
The target CYTFM_064B0S2_4343W is signed using
cysecuretoolswhich depends onimgtoolmanaged bypip. However, Arm Musca targets requires a modified/wrapped version of the image tool copied from trusted-firmware-m + MCUboot.To avoid conflicts in the version of
imgtoolused, we should only add the copied version ofimgtoolto python's system path for Musca targets instead of doing it globally for all targets.Impact of changes
Building and signing of CYTFM_064B0S2_4343W complete successfully.
Migration actions required
None.
Documentation
None.
Pull request type
Test results
Reviewers
@ARMmbed/team-cypress @romanjoe @hugueskamba @0xc0170