Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kas/common/base.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ header:
overrides:
repos:
isar:
commit: 680c07ee072483329885ba08b7b2b1f763326dc8
commit: c92b7c95b0b867aa477396cb331c28601ce9e5ec
2 changes: 1 addition & 1 deletion kas/debian/mtda-rpi4b-ebg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ header:
version: 17
includes:
- kas/common/base.yml
- kas/debian/bookworm-base.yml
- kas/debian/trixie-base.yml
Copy link
Member

Choose a reason for hiding this comment

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

This makes sense, but we should keep the whole MTDA layer on a single default distribution, as the protocol between mtda-cli and the server is incompatible between bookworm and trixie (i.e. a bookworm client cannot access a trixie server and vice versa). #524

Copy link
Author

Choose a reason for hiding this comment

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

So should I look for another fix in order to stay on bookworm? Or do you mean to upgrade the layer to trixie?

Copy link
Member

Choose a reason for hiding this comment

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

The solution itself is fine, but I'm not sure if we should apply this fix just to the rpi4 target. In the end, that means if you build for rpi4 it will be trixie based, otherwise it will be bookworm based. Let's ask @chombourger for guidance.

Copy link
Collaborator

Choose a reason for hiding this comment

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

given what mtda remains under heavy development, it probably makes sense to get everything on trixie and remove support for bookworm. it may be difficult to support both Debian N and N-1. Would you agree @fmoessbauer and @bniedermayr ?

Copy link
Member

Choose a reason for hiding this comment

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

Agree.

- kas/opt/ab-rootfs.yml
2 changes: 1 addition & 1 deletion kas/opt/ab-rootfs.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ header:
overrides:
repos:
cip-core:
commit: c75b584f32411a03c3ca9a9b023cd4e74d79d32f
commit: 2647471156b128bf8b0fb1d726bd05099fbbe1bd
2 changes: 1 addition & 1 deletion kas/opt/ab-rootfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:

cip-core:
url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git
branch: next
branch: master

local_conf_header:
partition-uuids: |
Expand Down
Loading