Skip to content
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

modules: tf-m: fix git clone during build #76094

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

tomi-font
Copy link
Collaborator

@tomi-font tomi-font commented Jul 19, 2024

As of v2.1.0 TF-M has updated to CMSIS v6 and switched from hosting the sources to depending on the upstream repository, cloning it at build time.

To prevent a download from happening during the build, CMSIS v6 sources are pushed to Zephyr's fork of TF-M and the CMSIS_PATH CMake variable is set to point to them.

Fixes #76090.

@zephyrbot zephyrbot added the area: TF-M ARM Trusted Firmware-M (TF-M) label Jul 19, 2024
@zephyrbot
Copy link
Collaborator

zephyrbot commented Jul 19, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@826c4a9 zephyrproject-rtos/trusted-firmware-m@069455b (main) zephyrproject-rtos/trusted-firmware-m@826c4a97..069455be

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@zephyrbot zephyrbot added manifest manifest-trusted-firmware-m DNM This PR should not be merged (Do Not Merge) labels Jul 19, 2024
@tomi-font tomi-font added this to the v3.7.0 milestone Jul 19, 2024
@tomi-font tomi-font added bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug labels Jul 19, 2024
@tomi-font tomi-font added the Release Blocker Use this label for justified release blockers label Jul 19, 2024
Vge0rge
Vge0rge previously approved these changes Jul 19, 2024
valeriosetti
valeriosetti previously approved these changes Jul 19, 2024
@tomi-font tomi-font requested a review from a team July 19, 2024 13:18
ithinuel
ithinuel previously approved these changes Jul 19, 2024
@fabiobaltieri
Copy link
Member

cfriedt
cfriedt previously approved these changes Jul 22, 2024
dkalowsk
dkalowsk previously approved these changes Jul 23, 2024
@dkalowsk
Copy link
Contributor

@nashif not sure if this was discussed for 3.7 inclusion but figured I'd tag you to make sure the decision is documented

d3zd3z
d3zd3z previously approved these changes Jul 24, 2024
Copy link
Collaborator

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objections to pulling it this way from the TSC.

@d3zd3z d3zd3z removed the DNM This PR should not be merged (Do Not Merge) label Jul 24, 2024
@aescolar aescolar added the DNM This PR should not be merged (Do Not Merge) label Jul 24, 2024
@aescolar
Copy link
Member

Added dnm until the module PR is merged, and this PR manifest points to a commit in the module and not PR

@aescolar
Copy link
Member

Thanks @tomi-font, the module PR has been merged. Please update the manifest pointer.

As of v2.1.0 TF-M has updated to CMSIS v6 and switched from hosting
the sources to depending on the upstream repository, cloning it at
build time.

To prevent a download from happening during the build, CMSIS v6 sources
are pushed to Zephyr's fork of TF-M and the `CMSIS_PATH` CMake variable
is set to point to them.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font tomi-font force-pushed the tfm_fix_cmsis_clone branch from 10d75b3 to 5fd2185 Compare July 25, 2024 05:00
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Jul 25, 2024
@tomi-font
Copy link
Collaborator Author

Do we also plan on forking the CMSIS v6 repo for after the release?

@aescolar aescolar merged commit 45ae952 into zephyrproject-rtos:main Jul 25, 2024
24 of 25 checks passed
@tomi-font tomi-font mentioned this pull request Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: TF-M ARM Trusted Firmware-M (TF-M) bug The issue is a bug, or the PR is fixing a bug manifest manifest-trusted-firmware-m priority: high High impact/importance bug Release Blocker Use this label for justified release blockers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TF-M: builds download source from external git repository