rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Switch to tun the GUI onto eglfs instead wayland / weston.

This commit is contained in:
j1nx 2021-02-09 21:04:04 +01:00
parent 3de64b84f5
commit 93fccc10a3
4 changed files with 2 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot-external/package/mycroft-service/mycroft-gui.service
View File

@ -3,22 +3,18 @@ Description=Mycroft GUI
PartOf=mycroft.service PartOf=mycroft.service
After=mycroft.service After=mycroft.service
After=mycroft-messagebus.service After=mycroft-messagebus.service
Wants=weston.service
After=weston.service
[Service] [Service]
User=mycroft User=mycroft
WorkingDirectory=/home/mycroft WorkingDirectory=/home/mycroft
Environment=QT_QPA_PLATFORM=wayland Environment=QT_QPA_PLATFORM=eglfs
Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins/kf5 Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins/kf5
Environment=QT_LOGGING_RULES='*=false' Environment=QT_LOGGING_RULES='*=false'
Environment=QT_IM_MODULE=qtvirtualkeyboard Environment=XDG_RUNTIME_DIR=/tmp/mycroft
Environment=XDG_RUNTIME_DIR=/tmp/weston
Environment=XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS Environment=XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS
Environment=LD_LIBRARY_PATH=/usr/lib Environment=LD_LIBRARY_PATH=/usr/lib
Environment=LIBEXEC_PATH=/libexec:/usr/libexec:/usr/lib/libexec Environment=LIBEXEC_PATH=/libexec:/usr/libexec:/usr/lib/libexec
Environment=QML2_IMPORT_PATH=/usr/lib/qml Environment=QML2_IMPORT_PATH=/usr/lib/qml
ExecStartPre=/usr/bin/sh -c 'export $(dbus-launch)'
ExecStart=mycroft-gui-app --hideTextInput --maximize ExecStart=mycroft-gui-app --hideTextInput --maximize
StandardOutput=null StandardOutput=null
Restart=on-failure Restart=on-failure

6
buildroot-external/package/mycroft-service/mycroft-service.mk
View File

@ -25,12 +25,6 @@ define MYCROFT_SERVICE_INSTALL_TARGET_CMDS
$(TARGET_DIR)/usr/lib/systemd/system/mycroft-skills.service $(TARGET_DIR)/usr/lib/systemd/system/mycroft-skills.service
$(INSTALL) -D -m 644 $(@D)/mycroft-gui.service \ $(INSTALL) -D -m 644 $(@D)/mycroft-gui.service \
$(TARGET_DIR)/usr/lib/systemd/system/mycroft-gui.service $(TARGET_DIR)/usr/lib/systemd/system/mycroft-gui.service
$(INSTALL) -D -m 644 $(@D)/weston.service \
$(TARGET_DIR)/usr/lib/systemd/system/weston.service
mkdir -p $(TARGET_DIR)/etc/xdg/weston
$(INSTALL) -D -m 644 $(@D)/weston.ini \
$(TARGET_DIR)/etc/xdg/weston/weston.ini
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

33
buildroot-external/package/mycroft-service/weston.ini
View File

@ -1,33 +0,0 @@
[core]
idle-time=0
require-input=false
[shell]
locking=false
panel-location=""
panel-position=""
background-color=0xff000000
panel-color=0xff000000
[libinput]
enable-tap=true
[keyboard]
keymap_rules=evdev
repeat-rate=30
repeat-delay=300
[output]
name=HDMI-A-1
mode=current
[output]
name=HDMI-A-2
mode=current
[output]
name=DSI-1
mode=current
[screen-share]
command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize

34
buildroot-external/package/mycroft-service/weston.service
View File

@ -1,34 +0,0 @@
[Unit]
Description=Weston, a Wayland compositor, as a system service
Documentation=man:weston(1) man:weston.ini(5)
Documentation=http://wayland.freedesktop.org/
Wants=dbus.socket
After=dbus.socket
PartOf=mycroft.service
After=mycroft.service
ConditionPathExists=/dev/tty0
[Service]
Environment=XDG_RUNTIME_DIR=/tmp/weston
Environment=XDG_CONFIG_HOME=/etc/xdg/weston
ExecStartPre=-/usr/bin/mkdir /tmp/weston
ExecStart=/usr/bin/weston-launch
# A virtual terminal is needed.
TTYPath=/dev/tty7
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
UtmpIdentifier=tty7
UtmpMode=user
User=mycroft
# Fail to start if not controlling the tty.
StandardInput=tty-fail
[Install]
WantedBy=multiuser.target