Split the asteroid-launcher environment config into 3 files - #294
Open
FlorentRevest wants to merge 2 commits into
Open
Split the asteroid-launcher environment config into 3 files#294FlorentRevest wants to merge 2 commits into
FlorentRevest wants to merge 2 commits into
Conversation
…-ins Merge the single default.conf into three orthogonal drop-ins that systemd reads in name order: 00-default.conf holds keys shared by every device, 10-platform.conf selects the QPA platform (eglfs by default, swapped to hwcomposer for hybris-machine watches), and machines override the placeholder 20-device.conf with their port specifics via FILESEXTRAPATHS. This removes the value duplication that came from every device shipping a full copy of the shared and platform settings.
Move the touchscreen input plugin out of every device's LIPSTICK_OPTIONS and into the service's ExecStart with no explicit event node: Qt's evdevtouch plugin auto-discovers the touchscreen. Watches now list only their extra input plugins (keyboard/mouse) in LIPSTICK_OPTIONS.
Member
Author
|
This goes hand in hand with AsteroidOS/meta-smartwatch#331 |
Member
|
This should probably be checked but |
Member
Author
|
Have you checked |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For now, the asteroid-launcher envvars are defined in /var/lib/environment/compositor/default.env and this file is overridden by all smartwatch layers.
This has caused some maintenance overhead because there are values which we would like to put in the environment of asteroid-launcher no matter the watch so those would have to be copied into each smartwatch layers. (that could be for features such as qtvirtualkeyboard and it's really awkward to modify smartwatch layers to make a new nistro feature work). Also, this has caused a lot of duplication, for example all hybris watches set a hwcomposer QPA which had to be copied 30 times when we could simply write it once in meta-asteroid based on whether the MACHINE inherits hybris-watch.
This change splits the environment into three files:
Additionally, to reduce the number of watch specific changes required, it uses a new syntax for the evdevtouch plugin such that Qt auto-discovers touch screens and therefore we don't need to manually find the evdev file backing the touchscreen on every port. This may cause some surprises and would be good to test on a few watches.