Skip to content

west.yml: Reset MCUboot revision due to history overwrite #55309

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 2, 2023
Merged

west.yml: Reset MCUboot revision due to history overwrite #55309

merged 1 commit into from
Mar 2, 2023

Conversation

de-nordic
Copy link
Collaborator

@de-nordic de-nordic commented Mar 1, 2023 •
edited by carlescufi
Loading

The commit resets MCUboot revision after zephyrproject-rtos/mcuboot main branch has been overwritten with mcuboot/mcuboot main.

The reset has been done due to MCUboot fork history, in Zephyr, has been broken and contained duplicate commits.

For details look at issue: #55303.

@de-nordic de-nordic added DNM This PR should not be merged (Do Not Merge) manifest-mcuboot labels Mar 1, 2023
@zephyrbot zephyrbot added manifest and removed DNM This PR should not be merged (Do Not Merge) labels Mar 1, 2023
@zephyrbot
Copy link
Collaborator

zephyrbot commented Mar 1, 2023 •
edited
Loading

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@750678e zephyrproject-rtos/mcuboot@5962433 (new-history) zephyrproject-rtos/[email protected]
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@f2a639c zephyrproject-rtos/trusted-firmware-m@a8313be (master) zephyrproject-rtos/[email protected]

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

@de-nordic
Copy link
Collaborator Author

@joerchan Do you know who can provide updates to TFM?

@de-nordic de-nordic requested review from nordicjm and carlescufi March 1, 2023 14:33
@nordicjm
Copy link
Collaborator

nordicjm commented Mar 1, 2023

zephyrproject-rtos/trusted-firmware-m#86 is the tf-m update to use when updating mcuboot

nordicjm
nordicjm previously approved these changes Mar 1, 2023
View reviewed changes
@nordicjm
Copy link
Collaborator

nordicjm commented Mar 1, 2023

#55125 is a full run with update mcuboot and tf-m

@joerchan
Copy link
Collaborator

joerchan commented Mar 1, 2023

@de-nordic From what failed in CI then what @nordicjm says is correct.

@microbuilder microbuilder requested a review from d3zd3z March 1, 2023 15:29
@de-nordic de-nordic force-pushed the west-mcuboot-reset branch from 905e6a5 to 2c6ef0e Compare March 1, 2023 16:18
@zephyrbot zephyrbot added manifest-trusted-firmware-m DNM This PR should not be merged (Do Not Merge) labels Mar 1, 2023
@de-nordic
Copy link
Collaborator Author

@de-nordic From what failed in CI then what @nordicjm says is correct.

@joerchan @nordicjm Thanks, it worked.

@joerchan When are you planning to merge the TF-M PR?

@microbuilder
Copy link
Member

@joerchan When are you planning to merge the TF-M PR?

Merged if you want to update the manifest here.

@de-nordic de-nordic force-pushed the west-mcuboot-reset branch from 2c6ef0e to ea682fc Compare March 2, 2023 13:37
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Mar 2, 2023
nordicjm
nordicjm previously approved these changes Mar 2, 2023
View reviewed changes
@de-nordic de-nordic force-pushed the west-mcuboot-reset branch from ea682fc to ccdec2a Compare March 2, 2023 14:10
@de-nordic de-nordic requested a review from nordicjm March 2, 2023 15:10
@de-nordic de-nordic changed the title [DNM] west.yml: Reset MCUboot revision due to history overwrite west.yml: Reset MCUboot revision due to history overwrite Mar 2, 2023
@de-nordic
west.yml: Reset MCUboot revision due to history overwrite
095295e 
The commit resets MCUboot revision after zephyrproject-rtos/mcuboot
main branch has been overwritten with mcuboot/mcuboot main.

The reset has been done due to MCUboot fork history, in Zephyr,
has been broken and contained duplicate commits.

For details look at issue: zephyrproject-rtos#55303.

The reset of MCUboot also requires update to following repositories:
  trusted-firmware-m

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic de-nordic force-pushed the west-mcuboot-reset branch from f7340ea to 095295e Compare March 2, 2023 15:25
@de-nordic de-nordic requested a review from nashif March 2, 2023 15:29
joerchan
joerchan approved these changes Mar 2, 2023
View reviewed changes
Copy link
Collaborator

@joerchan joerchan left a comment

Choose a reason for hiding this comment

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

Checked TF-M revision.

@carlescufi
Copy link
Member

Checked MCUboot SHA vs current tip of main in https://github.com/zephyrproject-rtos/mcuboot/tree/main, ack for 59624334748129cb93f096408911a227b0dd64c0

@carlescufi carlescufi merged commit 0cbc488 into zephyrproject-rtos:main Mar 2, 2023
@de-nordic de-nordic deleted the west-mcuboot-reset branch March 1, 2024 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joerchan joerchan joerchan approved these changes

@carlescufi carlescufi carlescufi approved these changes

@microbuilder microbuilder Awaiting requested review from microbuilder

@d3zd3z d3zd3z Awaiting requested review from d3zd3z

@nordicjm nordicjm Awaiting requested review from nordicjm

@nashif nashif Awaiting requested review from nashif

Assignees
No one assigned
Labels
manifest manifest-mcuboot manifest-trusted-firmware-m
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@de-nordic @zephyrbot @nordicjm @joerchan @microbuilder @carlescufi