Skip to content

Oxide: depend on rm2fb on rm2 only #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Oxide: depend on rm2fb on rm2 only #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af87286
Oxide: depend on rm2fb on rm2 only
Eeems Jun 2, 2023
1aa503d
Oxide: Force rm2fb dependency and start xochitl on error
Eeems Jun 2, 2023
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
10 changes: 6 additions & 4 deletions package/oxide/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: MIT

pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send)
pkgver=2.5-1
pkgver=2.5-2
_sentryver=0.5.0
timestamp=2023-01-26T22:52:14Z
maintainer="Eeems <[email protected]>"
Expand All @@ -13,7 +13,7 @@ flags=(patch_rm2fb)
image=qt:v2.3
source=(
"https://github.com/Eeems-Org/oxide/archive/refs/tags/v2.5.zip"
toltec-override.conf
toltec-rm2-override.conf
)
sha256sums=(
07bfb84e5adaebdebd2ce55b22f3764a1d4887c2b18364f5ec1053f171e3ecbe
Expand Down Expand Up @@ -90,8 +90,10 @@ tarnish() {
install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
"$srcdir"/toltec-override.conf
if [[ $arch = rm2 ]]; then
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
"$srcdir"/toltec-rm2-override.conf
fi
}
configure() {
systemctl daemon-reload
Expand Down
6 changes: 0 additions & 6 deletions package/oxide/toltec-override.conf
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions package/oxide/toltec-rm2-override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright (c) 2023 The Toltec Contributors
# SPDX-License-Identifier: MIT

[Unit]
After=rm2fb.service
Requires=rm2fb.service
OnFailure=xochitl.service