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.

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

west.yml: MCUboot synchronization from upstream #75634

Merged
merged 2 commits into from
Jul 11, 2024
Merged

west.yml: MCUboot synchronization from upstream #75634

merged 2 commits into from
Jul 11, 2024

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Jul 9, 2024 •
edited
Loading

Update Zephyr fork of MCUboot to revision:
fb2cf0ec3da3687b93f28e556ab682bdd4b85223

Brings following Zephyr relevant fixes:

  • 89807992 boot: zephyr: Fix build for nrf9160dk
  • 2f5a7f47 boot: zephyr: Fix build for thingy53
  • c9e4ab8b boot: zephyr: Fix build for thingy52
  • 1d79ef35 boot: Fix ASN.1 for mbedtls >= 3.1
  • 86acda9e ext: fiat: Use user-defined assert macro
  • 9ae634f3 bootutil: Fix signed/unsigned comparison in boot_read_enc_key
  • 533fef2a imgtool: Update version.py to take command line arguments
  • 316a139c imgtool: dumpinfo improvements
  • f3a57028 imgtool: Various dumpinfo fixes
  • d16a613f imgtool: Assert "measurement value" is last in boot_record.py
  • 36f8bf30 imgtool: Fix verify command for edcsa-p384 signed images
  • 2712f743 imgtool: Add missing requirements to requirements.txt file
  • 45d379e7 zephyr: boards: Add files needed for NXP FRDM MCXN947 QSPI variant
  • 3113df8f imgtool: initial sanity test
  • a4cb878c imgtool: Fixed missing dependency to 'pyyaml' (for dumpinfo)
  • faf2dd1f imgtool: fixed keys/general.py to pass existing unittests

Notes on process:

  1. The MCUboot update from mcu-tools/mcuboot/main with the SHA used in west.yaml is already synchronized to zephyrproject-rtos/mcuboot/upstream-sync branch, and is available in the Zephyr fork of MCUboot.
  2. The [DNM] on this PR should be kept until the PR passes all tests and is accepted.
  3. Once the PR passes all tests and gets accepted, the upstream-sync branch should be fast-forward merged to zephyrproject-rtos/mcuboot/main branch and [DNM] should be removed.
  4. After the main branch gets updated, this PR does not require further changes and should be merged as is.

Fixes #73301

@nordicjm nordicjm added this to the v3.7.0 milestone Jul 9, 2024
@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Jul 9, 2024
@zephyrbot
Copy link
Collaborator

zephyrbot commented Jul 9, 2024 •
edited
Loading

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@898a1ca zephyrproject-rtos/mcuboot@fb2cf0e (upstream-sync) zephyrproject-rtos/[email protected]

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

@nordicjm
Copy link
Collaborator Author

nordicjm commented Jul 9, 2024

@nashif have marked this for 3.7 as it is bug and security fixes, the top commit is needed for the zephyr version of mbedtls

@nordicjm nordicjm mentioned this pull request Jul 9, 2024
Merged
dleach02
dleach02 previously approved these changes Jul 9, 2024
View reviewed changes
dleach02
dleach02 reviewed Jul 9, 2024
View reviewed changes
west.yml Outdated
@@ -287,7 +287,7 @@ manifest:
groups:
- crypto
- name: mcuboot
revision: 898a1ca64a759541d9fcc37fef921db93d99ad70
revision: c06f7bb36782e0220b30c3d0640219d1368735d3
Copy link
Member

@dleach02 dleach02 Jul 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I know I can get to this commit sha but I don't see it when I click on the commits for the repo? Is it because this commit is a revert?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It gets pushed to upstream-sync for CI to run and approval, once approved and CI has passed, it gets pushed to main

Copy link
Member

@dleach02 dleach02 Jul 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@nordicjm, what is the reason? Is this incase CI fails you don't have main branch with some messed up SHA?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Just as a convenience, upstream-sync for open PRs and main for what zephyr points too, allows for seeing at a glance if the repo is out of date

d3zd3z
d3zd3z previously approved these changes Jul 9, 2024
View reviewed changes
@nordicjm
west.yml: MCUboot synchronization from upstream
b6d5e24 
Update Zephyr fork of MCUboot to revision:
  fb2cf0ec3da3687b93f28e556ab682bdd4b85223

Brings following Zephyr relevant fixes:
  - 89807992 boot: zephyr: Fix build for nrf9160dk
  - 2f5a7f47 boot: zephyr: Fix build for thingy53
  - c9e4ab8b boot: zephyr: Fix build for thingy52
  - 1d79ef35 boot: Fix ASN.1 for mbedtls >= 3.1
  - 86acda9e ext: fiat: Use user-defined assert macro
  - 9ae634f3 bootutil: Fix signed/unsigned comparison in
    boot_read_enc_key
  - 533fef2a imgtool: Update version.py to take command line
    arguments
  - 316a139c imgtool: dumpinfo improvements
  - f3a57028 imgtool: Various dumpinfo fixes
  - d16a613f imgtool: Assert "measurement value" is last in
    boot_record.py
  - 36f8bf30 imgtool: Fix verify command for edcsa-p384 signed
    images
  - 2712f743 imgtool: Add missing requirements to requirements.txt
    file
  - 45d379e7 zephyr: boards: Add files needed for NXP FRDM MCXN947
    QSPI variant
  - 3113df8f imgtool: initial sanity test
  - a4cb878c imgtool: Fixed missing dependency to 'pyyaml' (for
    dumpinfo)
  - faf2dd1f imgtool: fixed keys/general.py to pass existing
    unittests

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm dismissed stale reviews from d3zd3z and dleach02 via b6d5e24 July 10, 2024 06:39
@nordicjm nordicjm added the bug The issue is a bug, or the PR is fixing a bug label Jul 10, 2024
@nordicjm nordicjm requested review from dleach02 and d3zd3z July 10, 2024 06:40
@nordicjm
doc: release: 3.7: Add additional notes on MCUboot changes
2587aae 
Adds extra release notes for MCUboot

Signed-off-by: Jamie McCrae <[email protected]>
@zephyrbot zephyrbot added the Release Notes To be mentioned in the release notes label Jul 10, 2024
@zephyrbot zephyrbot requested review from aescolar and kartben July 10, 2024 06:46
@aescolar aescolar merged commit 0f97f0a into zephyrproject-rtos:main Jul 11, 2024
26 checks passed
@nordicjm nordicjm deleted the 37mcubootupdate branch July 12, 2024 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@d3zd3z d3zd3z d3zd3z approved these changes

@aescolar aescolar aescolar approved these changes

@de-nordic de-nordic Awaiting requested review from de-nordic

@nashif nashif Awaiting requested review from nashif

@dleach02 dleach02 Awaiting requested review from dleach02

@kartben kartben Awaiting requested review from kartben

Assignees

@d3zd3z d3zd3z

Labels
bug The issue is a bug, or the PR is fixing a bug manifest manifest-mcuboot Release Notes To be mentioned in the release notes size: XS A PR changing only a single line of code
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.

mcuboot: nordic development kits fail to compile
5 participants
@nordicjm @zephyrbot @d3zd3z @dleach02 @aescolar