Skip to content

Commit f559516

Browse files
EeemsEeems
authored
Stable merge for week 19 of 2023 (#693)
### Updated Packages - `koreader` - 2023.04-1 (#672 #681) - `display`, `rm2fb-client` - 0.0.31-1 (#680 #686) - If rm2fb fails to start on install, disable it to avoid soft-bricking the device - Add support for the following OS versions: - 3.2.2.1581 - 3.2.3.1595 - `wordlet` - 0.0.2-2 (#670) - Swap M and N on keyboard - Fix image thumbnail code - `harmony` - 0.2.2-1 (#670) - Fix exporting individual layers - `simple` - 0.2.0-2 (#670) - Add "range" input widget - Add "canvas" widget - Less debug output - Make images clickable - Move 'timeout' to its own thread instead of jamming task queue - Ignore empty lines - `remux` - 0.2.4-1 (#670) - Add "suspend" to remux FIFO api - `rpncalc` - 0.0.3-2 (#670) - Make it more like the hp48 - `toltec-base` - 1.2-1 (#685) - Only disable sys-subsystem-net-devices-usb1.device if on a reMarkable 1. On a reMarkable 2, this makes SSH over usb no longer available. - Make toltec-base properly clean itself up on uninstall - `kernelctl` - 0.1-6 (#691) - Reset to the default kernel on uninstall so that `toltecctl uninstall` will return the device to a stock state - `restream` - 1.2-1 (#688) - `fbink`, `fbdepth`, and `fbink-doom` - 1.25.0-1 (#687) **Note:** This doesn't change what OS version that toltec supports, as full support still requires `ddvk-hacks` to be updated, and for proper testing of various other packages.
1 parent f0954b4 commit f559516

File tree

10 files changed

+124
-36
lines changed

10 files changed

+124
-36
lines changed

‎package/display/package‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
archs=(rm1 rm2)
66
pkgnames=(display rm2fb-client)
7-
timestamp=2023-02-20T15:49:05Z
7+
timestamp=2023-04-16T20:53:38Z
88
maintainer="raisjn <[email protected]>"
99
license=MIT
1010
url="https://github.com/ddvk/remarkable2-framebuffer"
11-
pkgver=1:0.0.30-1
11+
pkgver=1:0.0.31-2
1212
_release="${pkgver%-*}"
1313
_release="v${_release#*:}"
1414
_libver=1.0.1
@@ -23,7 +23,7 @@ source=(
2323
rm2fb-preload.env
2424
)
2525
sha256sums=(
26-
bbd2acf8bc7d15082307c362985980e78cf1b48a69799aa602cf7dc3973339c7
26+
c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
2727
SKIP
2828
SKIP
2929
SKIP
@@ -64,12 +64,19 @@ display() {
6464
configure() {
6565
if [[ $arch = rm2 ]]; then
6666
systemctl daemon-reload
67-
systemctl enable rm2fb --now
68-
# Restart xochitl if it's running
69-
if systemctl --quiet is-active xochitl; then
70-
# Reset the crash count so we don't trigger remarkable-fail
71-
echo "0" > /tmp/crashnum
72-
systemctl restart xochitl
67+
if systemctl enable rm2fb --now; then
68+
# Restart xochitl if it's running
69+
if systemctl --quiet is-active xochitl; then
70+
# Reset the crash count so we don't trigger remarkable-fail
71+
echo "0" > /tmp/crashnum
72+
systemctl restart xochitl
73+
fi
74+
else
75+
systemctl disable rm2fb --now
76+
echo "Failed to start rm2fb. Keeping it disabled for now."
77+
echo "Please check the logs and open an issue:"
78+
echo " https://github.com/toltec-dev/toltec/issues/new"
79+
exit 1
7380
fi
7481
fi
7582
}

‎package/fbink/package‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
pkgnames=(fbink fbdepth fbink-doom)
66
url=https://github.com/NiLuJe/FBInk
7-
pkgver=1.24.0-1
8-
timestamp=2021-03-25T23:41:13Z
7+
pkgver=1.25.0-1
8+
timestamp=2022-12-05T02:50:38Z
99
maintainer="Mattéo Delabre <[email protected]>"
1010
license=GPL-3.0
1111
installdepends=(display)

‎package/kernelctl/package‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(kernelctl)
66
pkgdesc="Manage aftermarket kernels"
77
url=https://toltec-dev.org/
8-
pkgver=0.1-5
8+
pkgver=0.1-6
99
timestamp=2022-11-12T00:00Z
1010
section="utils"
1111
maintainer="Salvatore Stella <[email protected]>"
@@ -31,3 +31,18 @@ configure() {
3131
kernelctl backup vanilla
3232
fi
3333
}
34+
35+
preremove() {
36+
if [[ "$(kernelctl show | tail -n 1 | grep "vanilla-$(< /etc/version)")" == "" ]]; then
37+
if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
38+
echo "Unable to restore default kernel."
39+
echo "To force removal, you can run the following:"
40+
echo " opkg remove --force-remove kernelctl"
41+
echo "Warning: This will not leave you in a stock state"
42+
exit 1
43+
else
44+
echo "Restoring default kernel"
45+
kernelctl set default
46+
fi
47+
fi
48+
}

‎package/koreader/package‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
pkgnames=(koreader)
66
pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
77
url=https://github.com/koreader/koreader
8-
pkgver=2023.01-1
9-
timestamp=2022-07-31T13:31:10Z
8+
pkgver=2023.04-1
9+
timestamp=2023-04-27T20:53:54Z
1010
section="readers"
1111
maintainer="raisjn <[email protected]>"
1212
license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
2121
koreader
2222
)
2323
sha256sums=(
24-
f052d01e9be9c65883e1f8c00bae87b37ba6e47d3bf7b9bbbd746f58acc640c2
24+
7149beb95ee561c488491d723acbb2c641c99733abc1036de7064241a5f32813
2525
SKIP
2626
SKIP
2727
SKIP
@@ -44,6 +44,11 @@ package() {
4444
}
4545

4646
configure() {
47+
# This file can cause issues with startup when moving from 2022.08 to another version
48+
if [ -f /opt/koreader/cache/fontlist/fontinfo.dat ]; then
49+
rm /opt/koreader/cache/fontlist/fontinfo.dat
50+
fi
51+
4752
systemctl daemon-reload
4853

4954
if ! is-enabled "$pkgname.service"; then

‎package/restream/package‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@
55
pkgnames=(restream)
66
pkgdesc="Binary framebuffer capture tool for the reStream script"
77
url=https://github.com/rien/reStream
8-
pkgver=1.1-2
9-
timestamp=2021-01-28T23:25:40Z
8+
pkgver=1.2.0-1
9+
timestamp=2021-11-04T19:09:14Z
1010
section="screensharing"
1111
maintainer="Dan Shick <[email protected]>"
1212
license=MIT
1313

1414
image=rust:v2.1
15-
source=("https://github.com/rien/reStream/archive/${pkgver%-*}.tar.gz")
16-
sha256sums=(89fa4c8adfcdfb5266e11d1f8ed4c5d8dac12a68a7ee5622cf21f833bca1704f)
15+
source=("https://github.com/rien/reStream/archive/refs/tags/${pkgver%-*}.tar.gz")
16+
sha256sums=(4166142b15e1e7363dac302aa92aad5b44e0514cab233abecb51414952c1d5a1)
1717

1818
build() {
19-
# Fall back to system-wide config
20-
rm .cargo/config
21-
2219
cargo build --release --bin restream
2320
}
2421

‎package/rmkit/changelog‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
2023-03-12 raisjn <of.raisjn@arkose>
2+
3+
harmony
4+
5+
* fix exporting individual layers
6+
7+
rmkit
8+
9+
* swap M and N on keyboard
10+
* fix image thumbnail code
11+
12+
simple:
13+
14+
* add "range" input widget
15+
* add "canvas" widget
16+
* less debug output
17+
* make images clickable
18+
* move 'timeout' to its own thread instead of jamming task queue
19+
* ignore empty lines
20+
21+
remux
22+
23+
* add "suspend" to remux FIFO api
24+
25+
rpncalc
26+
27+
* make it more hp48 like (@cesss)
28+
29+
130
2022-05-06 raisjn <of.raisjn@arkose>
231
remux
332

‎package/rmkit/package‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
# SPDX-License-Identifier: MIT
44

55
pkgnames=(bufshot dumbskull genie harmony iago lamp mines nao remux rpncalc simple wordlet)
6-
timestamp=2022-06-23T20:03:10Z
6+
timestamp=2023-03-12T20:03:10Z
77
maintainer="raisjn <[email protected]>"
88
license=MIT
99
installdepends=(display)
1010
flags=(patch_rm2fb)
1111

1212
image=python:v2.1
1313
source=(
14-
https://github.com/rmkit-dev/rmkit/archive/070d5df29a71e55050a5e993f047f1590d69ec1c.zip
14+
https://github.com/rmkit-dev/rmkit/archive/2bf3488010eccf0d9e7f6c64e681517739420c58.zip
1515
remux.service
1616
genie.service
1717
)
1818
sha256sums=(
19-
e7f0379d5ad9de61c32a296ab831780cfea73352fbccfe2472422165943457ef
19+
a0d1a8b16adeca688d7df6a18e4c7404d9d4a405b33615dfb4e374f24ff3dded
2020
SKIP
2121
SKIP
2222
)
@@ -80,7 +80,7 @@ genie() {
8080
harmony() {
8181
pkgdesc="Procedural sketching app"
8282
url="https://rmkit.dev/apps/harmony"
83-
pkgver=0.2.1-1
83+
pkgver=0.2.2-1
8484
section="drawing"
8585

8686
package() {
@@ -147,7 +147,7 @@ nao() {
147147
remux() {
148148
pkgdesc="Launcher that supports multi-tasking applications"
149149
url="https://rmkit.dev/apps/remux"
150-
pkgver=0.2.3-1
150+
pkgver=0.2.4-1
151151
section="launchers"
152152

153153
package() {
@@ -179,7 +179,7 @@ remux() {
179179
rpncalc() {
180180
pkgdesc="RPN Calculator"
181181
url="https://rmkit.dev/apps/rpncalc"
182-
pkgver=0.0.2-2
182+
pkgver=0.0.3-2
183183
section="math"
184184

185185
package() {
@@ -193,7 +193,7 @@ rpncalc() {
193193
simple() {
194194
pkgdesc="Simple app script for writing scripted applications"
195195
url="https://rmkit.dev/apps/sas"
196-
pkgver=0.1.5-2
196+
pkgver=0.2.0-2
197197
section="devel"
198198

199199
package() {
@@ -204,7 +204,7 @@ simple() {
204204
wordlet() {
205205
pkgdesc="Wordle clone"
206206
url="https://rmkit.dev/apps/wordlet"
207-
pkgver=0.0.1-2
207+
pkgver=0.0.2-2
208208
section="games"
209209

210210
package() {

‎package/templatectl/package‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(templatectl)
66
pkgdesc="Tool to add/remove templates for xochitl"
77
url=https://github.com/PeterGrace/templatectl
8-
pkgver=0.1.3-3
8+
pkgver=0.1.3-4
99
timestamp=2021-01-15T01:23Z
1010
section="templates"
1111
maintainer="Peter Grace <[email protected]>"
@@ -41,7 +41,15 @@ configure() {
4141
}
4242

4343
postremove() {
44-
remove-bind-mount /usr/share/remarkable/templates
44+
local bind_path
45+
local unit_name
46+
local unit_path
47+
bind_path=/usr/share/remarkable/templates
48+
unit_name="$(systemd-escape --path "$bind_path").mount"
49+
unit_path="/lib/systemd/system/$unit_name"
50+
if [[ -e $unit_path ]]; then
51+
remove-bind-mount "$bind_path"
52+
fi
4553

4654
echo "To fully remove templatectl you'll need to run the following command:"
4755
echo " rm -rf /home/root/.entware/share/remarkable/templates"

‎package/toltec-base/package‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ archs=(rm1 rm2)
66
pkgnames=(toltec-base)
77
pkgdesc="Metapackage defining the base set of packages in a Toltec install"
88
url=https://toltec-dev.org/
9-
pkgver=1.1-1
10-
timestamp=2022-11-07T20:19:57Z
9+
pkgver=1.2-1
10+
timestamp=2023-05-08T19:31Z
1111
section="utils"
1212
maintainer="Eeems <[email protected]>"
1313
license=MIT
@@ -28,6 +28,20 @@ configure() {
2828
echo "Disabling automatic update"
2929
systemctl disable --now update-engine
3030
fi
31-
echo "Disabling usb1 network device to avoid long boots"
32-
systemctl mask sys-subsystem-net-devices-usb1.device
31+
if [[ "$arch" == "rm1" ]] && ! is-masked sys-subsystem-net-devices-usb1.device; then
32+
echo "Disabling usb1 network device to avoid long boots"
33+
systemctl mask sys-subsystem-net-devices-usb1.device
34+
elif [[ "$arch" == "rm2" ]] && is-masked sys-subsystem-net-devices-usb1.device; then
35+
echo "Enabling usb1 network device to ensure usb SSH works"
36+
systemctl unmask sys-subsystem-net-devices-usb1.device
37+
fi
38+
}
39+
40+
postremove() {
41+
if is-masked sys-subsystem-net-devices-usb1.device; then
42+
systemctl unmask sys-subsystem-net-devices-usb1.device
43+
fi
44+
if ! is-enabled "update-engine.service"; then
45+
systemctl enable update-engine
46+
fi
3347
}

‎scripts/install-lib‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,19 @@ is-enabled() {
2323
systemctl --quiet is-enabled "$1" 2> /dev/null
2424
}
2525

26+
# Check whether a systemd unit exists and is masked
27+
#
28+
# Arguments:
29+
#
30+
# $1 - Name of the systemd unit, e.g. "xochitl.service" or "xochitl"
31+
#
32+
# Exit code:
33+
#
34+
# 0 if the unit exists and is masked, 1 otherwise
35+
is-masked() {
36+
[[ "$(systemctl is-enabled "$1" 2> /dev/null)" == "masked" ]]
37+
}
38+
2639
# Check whether a systemd unit is in an active state
2740
# ("running")
2841
#

0 commit comments

Comments
 (0)