Skip to content

Commit 6a14d64

Browse files
committed
Add missing items from install
1 parent f383040 commit 6a14d64

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

package/rm2fb-timower/package

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ rm2fb-server() {
9292
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*.*}"
9393
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*}"
9494
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/rm2fb.service
95+
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/install/lib/systemd/system/rm2fb.socket
96+
install -D -m 755 "$srcdir"/install/bin/rm2fb_server "$pkgdir"/opt/bin/rm2fb-server
9597
fi
9698
}
9799

@@ -138,6 +140,7 @@ rm2fb-client() {
138140
package() {
139141
libname="librm2fb_client.so.$_libver"
140142
install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/install/lib/"$libname"
143+
install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/install/lib/"librm2fb_client_no_hook.so"
141144
install -d "$pkgdir"/usr/lib
142145
ln -s /opt/lib/"$libname" "$pkgdir"/usr/lib/"$libname"
143146

package/rm2fb-timower/rm2fb-preload.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Please do not modify files shipped by Toltec, or they risk being
44
# overwritten with updates. Instead create your own files in this directory.
55
if [[ -f /dev/shm/swtfb.01 ]]; then
6-
export LD_PRELOAD="$LD_PRELOAD:/opt/lib/librm2fb_client.so.1"
6+
export LD_PRELOAD="$LD_PRELOAD:/opt/lib/librm2fb_client.so"
77
else
88
echo "rm2fb server is not running: starting without rm2fb client"
99
fi

package/rm2fb-timower/rm2fb.service

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ StartLimitIntervalSec=600
44
StartLimitBurst=4
55
Before=xochitl.service launcher.service remarkable-reboot.service remarkable-shutdown.service
66
After=opt.mount
7-
ConditionFileNotEmpty=/opt/lib/librm2fb_server.so
7+
ConditionFileNotEmpty=/opt/bin/rm2fb-server
88

99
[Service]
1010
Restart=on-failure
@@ -13,4 +13,5 @@ ExecStart=/opt/bin/rm2fb-server
1313
Environment=HOME=/home/root
1414

1515
[Install]
16+
Also=rm2fb.socket
1617
WantedBy=multi-user.target

0 commit comments

Comments
 (0)