From bfaefa90120a4f32df3fe2818a979440bbee12f1 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 1 Feb 2024 23:00:09 -0700 Subject: [PATCH] Update package --- applications/display-server/blight-client | 2 + .../display-server/display-server.pro | 12 ++++- .../system-service/system-service.pro | 6 ++- assets/etc/systemd/system/blight.service | 19 +++++++ assets/etc/systemd/system/tarnish.service | 3 +- package | 52 ++++++++++++++++--- 6 files changed, 85 insertions(+), 9 deletions(-) create mode 100755 applications/display-server/blight-client create mode 100644 assets/etc/systemd/system/blight.service diff --git a/applications/display-server/blight-client b/applications/display-server/blight-client new file mode 100755 index 000000000..ae7accb48 --- /dev/null +++ b/applications/display-server/blight-client @@ -0,0 +1,2 @@ +#!/bin/bash +LD_PRELOAD=/opt/lib/libblight_client.so:$LD_PRELOAD RM2FB_SHIM=1 RM2FB_DISABLE=1 exec -a "$1" "$@" diff --git a/applications/display-server/display-server.pro b/applications/display-server/display-server.pro index 5d6915ed5..d31b69274 100644 --- a/applications/display-server/display-server.pro +++ b/applications/display-server/display-server.pro @@ -33,6 +33,14 @@ configFile.files = ../../assets/etc/dbus-1/system.d/codes.eeems.blight.conf configFile.path = /etc/dbus-1/system.d/ INSTALLS += configFile +service.files = ../../assets/etc/systemd/system/blight.service +service.path = /etc/systemd/system/ +INSTALLS += service + +client.files = blight-client +client.path = /opt/bin/ +INSTALLS += client + TARGET = blight include(../../qmake/common.pri) target.path = /opt/bin @@ -59,4 +67,6 @@ RESOURCES += \ DISTFILES += \ ../../assets/etc/dbus-1/system.d/codes.eeems.blight.conf \ - generate_xml.sh + ../../assets/etc/systemd/system/blight.service \ + generate_xml.sh \ + blight-client diff --git a/applications/system-service/system-service.pro b/applications/system-service/system-service.pro index 052559cc2..85afc4798 100644 --- a/applications/system-service/system-service.pro +++ b/applications/system-service/system-service.pro @@ -93,7 +93,11 @@ LIBS += -lz DISTFILES += \ fi.w1.wpa_supplicant1.xml \ generate_xml.sh \ - org.freedesktop.login1.xml + org.freedesktop.login1.xml \ + ../../assets/etc/dbus-1/system.d/codes.eeems.oxide.conf \ + ../../assets/etc/systemd/system/tarnish.service \ + ../../assets/opt/usr/share/applications/xochitl.oxide \ + ../../assets/opt/etc/keyd/oxide.conf INCLUDEPATH += ../../shared/mxcfb diff --git a/assets/etc/systemd/system/blight.service b/assets/etc/systemd/system/blight.service new file mode 100644 index 000000000..f9a2fa87d --- /dev/null +++ b/assets/etc/systemd/system/blight.service @@ -0,0 +1,19 @@ +[Unit] +Description=Oxide display server +After=home.mount +StartLimitInterval=30 +StartLimitBurst=5 +OnFailure=remarkable-fail.service +Before=remarkable-reboot.service remarkable-shutdown.service +Conflicts=xochitl.service +Conflicts=sync.service + +[Service] +Type=dbus +BusName=codes.eeems.blight1 +ExecStart=/opt/bin/blight --break-lock +Restart=on-failure +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/assets/etc/systemd/system/tarnish.service b/assets/etc/systemd/system/tarnish.service index 2889afeb2..585dc95dd 100644 --- a/assets/etc/systemd/system/tarnish.service +++ b/assets/etc/systemd/system/tarnish.service @@ -1,5 +1,5 @@ [Unit] -Description=oxide system service +Description=Oxide system service After=home.mount StartLimitInterval=30 StartLimitBurst=5 @@ -7,6 +7,7 @@ OnFailure=remarkable-fail.service Before=remarkable-reboot.service remarkable-shutdown.service Conflicts=xochitl.service Conflicts=sync.service +Wants=blight.service [Service] Type=dbus diff --git a/package b/package index 6359a0b3a..949b69428 100644 --- a/package +++ b/package @@ -2,7 +2,17 @@ # Copyright (c) 2020 The Toltec Contributors # SPDX-License-Identifier: MIT -pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry) +pkgnames=( + fbinfo + inject_evdev + liboxide + liboxide-dev + libsentry + oxide + oxide-display + oxide-extra + oxide-utils +) _oxidever=$(grep 'VERSION =' qmake/common.pri | awk '{print $3}') pkgver="$_oxidever~VERSION~" _sentryver=0.7.0 @@ -24,7 +34,7 @@ build() { oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard") + installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "oxide-display=$pkgver" reboot-guard) replaces=(erode tarnish decay corrupt) conflicts=(erode tarnish decay corrupt) @@ -49,6 +59,8 @@ oxide() { # Task switcher install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide + # Keyd configuration + install -D -m 644 -t "$pkgdir"/opt/etc/keyd "$srcdir"/release/opt/etc/keyd/oxide.conf } configure(){ @@ -80,6 +92,23 @@ oxide() { } } +oxide-display() { + pkgdesc="Oxide display server" + section="devel" + installdepends=("liboxide=$pkgver" "libsentry=$_sentryver") + + package(){ + # Display server + install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.blight.conf + install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/blight.service + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/blight + # Client + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libblight_client.so* + # QPA + install -D -m 755 -t "$pkgdir"/opt/usr/lib/plugins/platforms "$srcdir"/release/opt/usr/lib/plugins/platforms/liboxide.so* + } +} + oxide-extra() { pkgdesc="Extra applications for oxide" section="utils" @@ -113,15 +142,16 @@ oxide-utils() { conflicts=(rot notify-send update-desktop-database desktop-file-validate) package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/update-desktop-database - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xclip install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio } } @@ -135,6 +165,15 @@ inject_evdev() { } } +fbinfo() { + pkgdesc="Print out framebuffer info" + section="utils" + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fbinfo + } +} + liboxide() { pkgdesc="Shared library for oxide applications" section="devel" @@ -142,6 +181,7 @@ liboxide() { package() { install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/liboxide.so* install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libqsgepaper.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libblight.so* } }