diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 3efc54b9..8d6d2542 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,60 @@ +- commits: + - subject: Add special case for base DTO params on RPI config + hash: 6e6a796da5ecc846248eae4c8495bc626964c038 + body: > + While ordering is important in the RPI firmware configuration file + (config.txt), + + some dt params are by default considered part of the base dt overlay + + if they are not used by other overlays. + + Unfortunately the [list of dtparams](https://github.com/raspberrypi/firmware/blob/master/boot/overlays/README#L133) + + is too long to add all of them as exceptions, but we can add the params + + used in the default config.txt provided in OS images, to avoid reboots + + when updating to this new supervisor and correctly parsing the + + provisioning config.txt as variables. + + + While this addition handles most common scenarios, there is still a + + chance a user may have use other base overlay dt params in the initial + + config, in which case those will be interpreted according to the + + relative ordering + footer: + Change-type: patch + change-type: patch + author: Felipe Lalanne + nested: [] + - subject: Fix processing of dtoverlay/dtparams on config.txt + hash: 9546a1a3b1b919649dc401b63f0ff0dedad918b0 + body: | + DT overlays and DT params need to be consumed in the order that they + appear on the file. DT params apply to the last dtoverlay defined on the + file, or to the base overlay. + + This commit updates config.txt parsing to consider this ordering, and it + also ensures global dtparams are written first so they cannot be + overriden by later overlays. + + Because of the more strict parsing method, it is possible that existing + HOST_CONFIG vars do not match the interpretation of the parser. If + that's the case, the supervisor will re-apply the target state which + will cause the device to reboot. + footer: + Change-type: major + change-type: major + author: Felipe Lalanne + nested: [] + version: 16.0.0 + title: "" + date: 2024-02-08T21:45:41.648Z - commits: - subject: Respect update strategies app-wide instead of at the service level hash: 3afcef296914840268356f7f98bc4bd8cce9427c diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e9631b..3b0ae747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +# v16.0.0 +## (2024-02-08) + +* Add special case for base DTO params on RPI config [Felipe Lalanne] +* Fix processing of dtoverlay/dtparams on config.txt [Felipe Lalanne] + # v15.3.1 ## (2024-02-01) diff --git a/VERSION b/VERSION index 2471c64e..0e94e314 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.3.1 \ No newline at end of file +16.0.0 \ No newline at end of file diff --git a/balena.yml b/balena.yml index 9b06603d..30f62360 100644 --- a/balena.yml +++ b/balena.yml @@ -2,6 +2,6 @@ name: balena-supervisor description: 'Balena Supervisor: balena''s agent on devices.' joinable: false type: sw.application -version: 15.3.1 +version: 16.0.0 provides: - slug: sw.compose.long-volume-syntax diff --git a/package-lock.json b/package-lock.json index f47d97f8..22b9141f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "balena-supervisor", - "version": "15.3.1", + "version": "16.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "balena-supervisor", - "version": "15.3.1", + "version": "16.0.0", "license": "Apache-2.0", "dependencies": { "@balena/systemd": "^0.5.0", diff --git a/package.json b/package.json index afecf427..caac6f67 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "balena-supervisor", "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.", - "version": "15.3.1", + "version": "16.0.0", "license": "Apache-2.0", "repository": { "type": "git", @@ -140,6 +140,6 @@ "yargs": "^15.4.1" }, "versionist": { - "publishedAt": "2024-02-01T19:31:13.027Z" + "publishedAt": "2024-02-08T21:45:42.298Z" } }