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: Update sdk-mcuboot #20328

Merged
merged 3 commits into from
Feb 14, 2025
Merged

manifest: Update sdk-mcuboot #20328

merged 3 commits into from
Feb 14, 2025

Conversation

nordicjm
Copy link
Contributor

Updates MCUboot to pull in upstream changes

@nordicjm nordicjm requested review from a team as code owners February 13, 2025 09:58
@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 Feb 13, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 13, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@3897a7b nrfconnect/sdk-mcuboot@7fd6163 (main) nrfconnect/sdk-mcuboot@3897a7b0..7fd6163e

All manifest checks OK

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 13, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: a2b4d8e2e34707ed97ae76c4e86646a7c3f7371c
mcuboot: PR head: 7fd6163e6ca5d069b9cc26f2d6746bad3f8bc9e7

more details

sdk-nrf:

PR head: a2b4d8e2e34707ed97ae76c4e86646a7c3f7371c
merge base: ba4a37e4f1565ffa4c15af0745950b237bc458b9
target head (main): b84a60168174bc67b08d8310455c24d54e710eb2
Diff

mcuboot:

PR head: 7fd6163e6ca5d069b9cc26f2d6746bad3f8bc9e7
merge base: 3897a7b0f645f3c79829bd6840fc3502ea1bdacb
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 (13)
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── boot_serial
│  │  │  │  ├── src
│  │  │  │  │  │ boot_serial.c
│  │  │  ├── bootutil
│  │  │  │  ├── include
│  │  │  │  │  ├── bootutil
│  │  │  │  │  │  │ image.h
│  │  │  │  ├── src
│  │  │  │  │  ├── image_ed25519.c
│  │  │  │  │  │ loader.c
│  │  │  ├── zephyr
│  │  │  │  ├── flash_map_extended.c
│  │  │  │  ├── include
│  │  │  │  │  ├── mcuboot_config
│  │  │  │  │  │  │ mcuboot_config.h
│  │  ├── docs
│  │  │  │ encrypted_images.md
│  │  ├── scripts
│  │  │  ├── imgtool
│  │  │  │  ├── image.py
│  │  │  │  │ main.py
subsys
│  ├── nrf_compress
│  │  ├── src
│  │  │  │ lzma.c
tests
│  ├── subsys
│  │  ├── nrf_compress
│  │  │  ├── decompression
│  │  │  │  ├── lzma
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
west.yml

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_bbe5b33786

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 544
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-sdk-mcuboot
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • 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_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • 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-proprietary_esb
    • 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
    • test-secdom-samples-public

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.

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

Updates MCUboot to pull in upstream changes

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Fixes issues with this test which are appearing in CI but not
with on-desk builds

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
The LZMA library believes that free() should be called with an
address of NULL, this is completely invalid, therefore ignore
any attempt to free memory at this address

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm merged commit 6880376 into nrfconnect:main Feb 14, 2025
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.

4 participants