mendersoftware / mender-mcu / 2003557205

57%

main: 0%

Build Type

push

gitlab-ci

Committed by danielskinstad

Commit Message

feat: support Zephyr 4.2.0

* replace deprecated swap mode option
From https://docs.zephyrproject.org/latest/releases/migration-guide-4.1.html:
```
The Kconfig ``SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH`` has been deprecated and replaced
with ``SB_CONFIG_MCUBOOT_MODE_SWAP_USING_MOVE``, applications should be updated to select this
new symbol if they were selecting the old symbol.
```

Note that this will still allow us to build with older versions, as the
MCUboot options set in mender-mcu's Kconfig are merely there for verbosity

* return int in response callbacks
This is needed in order to use Zephyr 4.2.0

From https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html:
```
The http_response_cb_t HTTP client response callback signature has changed.
The callback function now returns int instead of void. This allows the
application to abort the HTTP connection. Existing applications need to
update their response callback implementations. To retain current behavior,
simply return 0 from the callback.
```

In order to not break backwards compatibility we use Zephyr's `ZEPHYR_VERSION`
and `ZEPHYR_VERSION_CODE` to define macros that return void on versions
below 4.2.0 and int on newer versions.

Ticket: MEN-8638
Changelog: Title

Signed-off-by: Daniel Skinstad Drabitzius <daniel.drabitzius@northern.tech>

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

42 existing lines in 1 file now uncovered.

2303 of 4020 relevant lines covered (57.29%)

71.22 hits per line