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

manifest: Bring SHA512 fix for MCUboot serial recovery. #18821

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

de-nordic
Copy link
Contributor

Fix for non-working serial recovery with MCUboot configured for SHA512.

Fix for NCSDK-30244

@de-nordic de-nordic requested a review from a team as a code owner November 12, 2024 15:13
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 12, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 12, 2024

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@e60dc3f nrfconnect/sdk-mcuboot@bcdf6e2 (main) nrfconnect/sdk-mcuboot@e60dc3fb..bcdf6e24

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 12, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 2

Inputs:

Sources:

sdk-nrf: PR head: 1f23ff57a7432f569a0997dae9bde1cbea81c91f
mcuboot: PR head: bcdf6e24493a0c3de7c5f3a126a6b4075b2ad088

more details

sdk-nrf:

PR head: 1f23ff57a7432f569a0997dae9bde1cbea81c91f
merge base: c588ebd216a25b61db7540818ce9070226eb61fb
target head (main): c588ebd216a25b61db7540818ce9070226eb61fb
Diff

mcuboot:

PR head: bcdf6e24493a0c3de7c5f3a126a6b4075b2ad088
merge base: e60dc3fbd7ce52d6fdc5352cf0a98c159c7a95f5
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (3)
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── boot_serial
│  │  │  │  ├── src
│  │  │  │  │  │ boot_serial.c
│  │  │  ├── zephyr
│  │  │  │  │ Kconfig
west.yml

Outputs:

Toolchain

Version: f51bdba1d9
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:f51bdba1d9_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 499
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-sdk-mcuboot
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@nvlsianpu nvlsianpu added this to the 2.8.0 milestone Nov 12, 2024
@nvlsianpu nvlsianpu added the backport v2.8-branch auto-create a PR with same commits to v2.8-branch label Nov 12, 2024
west.yml Outdated
@@ -129,7 +129,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: e60dc3fbd7ce52d6fdc5352cf0a98c159c7a95f5
revision: pull/376/head
Copy link
Contributor

Choose a reason for hiding this comment

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

bcdf6e24493a0c3de7c5f3a126a6b4075b2ad088

@rlubos rlubos removed the backport v2.8-branch auto-create a PR with same commits to v2.8-branch label Nov 13, 2024
@rlubos
Copy link
Contributor

rlubos commented Nov 13, 2024

I'll backport this manually.

Fix for non-working serial recovery with MCUboot configured
for SHA512.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
@rlubos rlubos merged commit 4739ae0 into nrfconnect:main Nov 13, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-mcuboot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants