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

Revert RAM load single application commits #2106

Merged
merged 4 commits into from
Oct 30, 2024

Conversation

nordicjm
Copy link
Collaborator

These commits should not have been merged until after the zephyr 4.0 stablilisation process was complete, a bug has been found which needs to be included in MCUboot for this release, therefore revert the commits so an MCUboot module update can be included

@nordicjm nordicjm merged commit 41c6586 into mcu-tools:main Oct 30, 2024
58 checks passed
@teburd
Copy link

teburd commented Nov 4, 2024

Which bug needs to be included out of curiosity?

@carlescufi
Copy link
Collaborator

Next time, why not create a v4.0.0 branch in sdk-mcuboot so that we can cherry-pick fixes there but continue to use main?

@de-nordic
Copy link
Collaborator

Next time, why not create a v4.0.0 branch in sdk-mcuboot so that we can cherry-pick fixes there but continue to use main?

I think that MCUboot requires some definition of release management and proper branching for that.
Not only for sdk-mcuboot but for upstream too.

@nordicjm
Copy link
Collaborator Author

nordicjm commented Nov 6, 2024

The PR was merged by someone that does not follow zephyr releases so was not aware of the zephyr release, it should not have been merged during the zephyr release time. And I'm not fond of creating mirror branches which then deviate from how we use mcuboot in main, for an lts release that's fine or if there is a security fix needed in a still supported version of zephyr but having multiple branches for no reason creates a mess

Zephyr x.x.0 releases should always reference a valid mcuboot commit which is in this repository, point releases may diverge

@carlescufi
Copy link
Collaborator

@nordicjm but MCUboot is its own project, I am not sure why the release cadence and cycles of Zephyr, which is one of its users, should influence the state of main in MCUboot.

@nordicjm
Copy link
Collaborator Author

nordicjm commented Nov 6, 2024

@nordicjm but MCUboot is its own project, I am not sure why the release cadence and cycles of Zephyr, which is one of its users, should influence the state of main in MCUboot.

It is it's own project, the 2 active developers/maintainers are zephyr developers, so the overlap is almost 100%

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants