Skip to content
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.

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

Use xochitl instead of remarkable-shutdown in rm2fb-server #325

Merged
merged 2 commits into from
Apr 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions package/rm2fb/overwrite-server-argv0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/server/main.cpp b/src/server/main.cpp
index 755be17..4186060 100755
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -173,6 +173,10 @@ int __libc_start_main(int (*_main)(int, char **, char **), int argc,
swtfb::SDK_BIN = argv[0];
fprintf(stderr, "BIN FILE: %s\n", argv[0]);

+ size_t argv0_len = strlen(argv[0]);
+ strncpy(argv[0], "rm2fb-server", argv0_len);
+ argv[0][argv0_len] = 0;
+
return func_main(server_main, argc, argv, init, fini, rtld_fini, stack_end);
};
};
9 changes: 8 additions & 1 deletion package/rm2fb/package
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ maintainer="raisjn <[email protected]>"
license=MIT
pkgdesc="Interface to the reMarkable 2 framebuffer"
url="https://github.com/ddvk/remarkable2-framebuffer"
pkgver=1.0.1-1
pkgver=1.0.1-2
section="devel"

image=qt:v1.1
Expand All @@ -18,20 +18,27 @@ source=(
rm2fb.service
rm2fb-server
rm2fb-client
overwrite-server-argv0.patch
)
sha256sums=(
76f1c0b72260a9743f3e008100ffddf1f89cd44c6f0376d906e98ae66eaea716
SKIP
SKIP
SKIP
SKIP
SKIP
)

build() {
qmake
make
}

prepare() {
patch -p1 -d"$srcdir" < "$srcdir"/overwrite-server-argv0.patch
rm "$srcdir"/overwrite-server-argv0.patch
}

package() {
mkdir -p "$pkgdir"/opt/lib "$pkgdir"/opt/etc "$pkgdir"/opt/bin
install -D -m 755 "$srcdir/src/client/librm2fb_client.so.${pkgver%-*}" "$pkgdir"/opt/lib/
Expand Down
2 changes: 1 addition & 1 deletion package/rm2fb/rm2fb-server
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
LD_PRELOAD=/opt/lib/librm2fb_server.so.1 exec "$(command -v remarkable-shutdown)"
LD_PRELOAD=/opt/lib/librm2fb_server.so.1 exec "$(command -v xochitl)"
3 changes: 2 additions & 1 deletion package/rm2fb/rm2fb.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ After=opt.mount
StartLimitInterval=30
StartLimitBurst=5
Conflicts=
ConditionFileNotEmpty=/opt/lib/librm2fb_server.so.1

[Service]
ExecStart=/usr/bin/remarkable-shutdown
ExecStart=/usr/bin/xochitl
Restart=on-failure
RestartSec=5
Environment="HOME=/home/root"
Expand Down