Refactor eglfs config for RPi compat (relates to #22)

NeonGeckoCom · Mar 27, 2024 · d013fd4 · d013fd4
1 parent f436aa5
commit d013fd4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/overlays/29-ovos-shell/etc/neon/eglfs.json b/overlays/29-ovos-shell/etc/neon/eglfs.json
@@ -1 +1 @@
-{ "device": "/dev/dri/card1" }
+{ "device": "/dev/dri/card0" }
diff --git a/overlays/29-ovos-shell/etc/neon/gui-shell.conf b/overlays/29-ovos-shell/etc/neon/gui-shell.conf
@@ -1,7 +1,6 @@
 QT_IM_MODULE=qtvirtualkeyboard
 QT_QPA_PLATFORM=eglfs
 QT_QPA_EGLFS_KMS_ATOMIC=1
-QT_QPA_EGLFS_KMS_CONFIG=/etc/neon/eglfs.json
 QT_QPA_PLATFORMTHEME=qt5ct
 QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins:/usr/lib/aarch64-linux-gnu/qt5/plugins/kf5
 QT_QUICK_CONTROLS_CONF=/home/neon/.config/qtquickcontrols2material.conf

diff --git a/recipes/29-ovos-shell.yml b/recipes/29-ovos-shell.yml
@@ -67,8 +67,7 @@ actions:
   - action: run
     description: Patch device path for Orange Pi5
     chroot: True
-    command: |
-      sed -i -e "s|card1|card0|g" /etc/neon/eglfs.json
+    command: echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/neon/eglfs.json" >> /etc/neon/gui-shell.conf
 {{ end }}
 
   - action: run