Skip to content

Commit eed41f1

Browse files
EeemsEeems
authored
Stable merge for week 22 of 2014 (#877)
### Updated Packages - `appmarkable` - 0.1.3-1 (#876 #875) - `micro` - 2.0.13-2 (#870) - `toltec-bootstrap` - 0.4.4-1 (#704 #690 #873) - `webinterface-upload-button` - 1.1.1-3 (#870) - `open-remarkable-shutdown` - 1.0-3 (#879) - `toltec-deletions` - 0.1-5 (#880) ### Tooling - Fix sha256sum validation (#870).
1 parent b19ecf3 commit eed41f1

File tree

9 files changed

+81
-31
lines changed

9 files changed

+81
-31
lines changed

‎package/appmarkable/package

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
pkgnames=(appmarkable)
66
pkgdesc="Front-end for apps that do not have a graphical user interface"
77
url="https://github.com/LinusCDE/appmarkable"
8-
pkgver=0.0.0-11
9-
timestamp=2021-03-10T18:36Z
8+
pkgver=0.1.3-1
9+
timestamp=2024-06-01T21:00Z
1010
section="devel"
1111
maintainer="Linus K. <[email protected]>"
1212
license=MIT
1313
installdepends=(display)
1414
flags=(patch_rm2fb)
1515

16-
image=rust:v2.1
17-
source=(https://github.com/LinusCDE/appmarkable/archive/c44ee87ea2b1f1e41c9592476c076150c9a1acf4.zip)
18-
sha256sums=(76e151aeae0f18b206dd3c6258bf74bcb5256ee2f803e1ed2073278831158f60)
16+
image=rust:v3.1
17+
source=(https://github.com/LinusCDE/appmarkable/archive/0463ffc5bdaf29ff0a0e92fb15a90b06e310c417.zip)
18+
sha256sums=(bb45ed03a360f1a58e58e5a8e3176008e8e63053fc46925d20be92b532a02822)
1919

2020
build() {
2121
# Fall back to system-wide config

‎package/micro/package

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
pkgnames=(micro)
66
pkgdesc="Modern and intuitive terminal-based text editor"
77
url=https://micro-editor.github.io/
8-
pkgver=2.0.13-1
8+
pkgver=2.0.13-2
99
timestamp=2023-10-21T22:38:29Z
1010
section="utils"
1111
maintainer="Eeems <[email protected]>"
1212
license=MIT
1313

1414
source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz")
15-
sha256sums=(cbbed4e69567871462464049646dc11fdad8b8c75fde5d75856068c2cfbd2d38)
15+
sha256sums=(adb9cf644354a5c85819db40e1a427f0f4951b172597bbcd3ef94ecc4a8c4b75)
1616

1717
package() {
1818
install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE"

‎package/open-remarkable-shutdown/package

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Copyright (c) 2021 The Toltec Contributors
33
# SPDX-License-Identifier: MIT
44

5-
archs=(rmallos2)
5+
archs=(rmallos2 rm1os3)
66
pkgnames=(open-remarkable-shutdown)
77
pkgdesc="Use remarkable-splash to display shutdown and reboot images"
88
url=https://github.com/ddvk/remarkable-splash
9-
pkgver=1.0-2
9+
pkgver=1.0-3
1010
timestamp=2022-02-28T00:12Z
1111
section="utils"
1212
maintainer="Eeems <[email protected]>"

‎package/toltec-bootstrap/package

+7-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
pkgnames=(toltec-bootstrap)
66
pkgdesc="Manage your Toltec install"
77
url=https://toltec-dev.org/
8-
pkgver=0.4.1-1
9-
timestamp=2023-11-27T00:34Z
8+
pkgver=0.4.4-1
9+
timestamp=2024-05-31T19:13Z
1010
section="utils"
1111
maintainer="Eeems <[email protected]>"
1212
license=MIT
@@ -64,3 +64,8 @@ configure() {
6464
echo
6565
fi
6666
}
67+
68+
postremove() {
69+
# Reload rules without the input udev rule
70+
udevadm control --reload-rules && udevadm trigger
71+
}

‎package/toltec-bootstrap/toltecctl

+4-4
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ check-version() {
156156
cd "$cwd"
157157

158158
if ! grep -q "${current_model}=${current_version}" "${toltec_share}/Compatibility"; then
159-
LOG ERROR "You’re running an unsupported OS version: $current_version"
160-
LOG ERROR "Please monitor Toltec releases for upcoming support"
159+
log ERROR "You’re running an unsupported OS version: $current_version"
160+
log ERROR "Please monitor Toltec releases for upcoming support"
161161
return 1
162162
fi
163163

@@ -746,8 +746,8 @@ install-standalone-opkg() {
746746
# installed on the reMarkable does not) in the PATH
747747
install-standalone-wget() {
748748
local wget_path="${toltec_share}/wget"
749-
local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1
750-
local wget_checksum=8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc
749+
local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1
750+
local wget_checksum=c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5
751751

752752
if [ -f "$wget_path" ] && ! [[ -e $wget_path ]] || ! sha256sum -c <(echo "$wget_checksum $wget_path") > /dev/null 2>&1; then
753753
rm "$wget_path"

‎package/toltec-deletions/package

+22-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,37 @@
22
# Copyright (c) 2023 The Toltec Contributors
33
# SPDX-License-Identifier: MIT
44

5-
archs=(rmallos2 rmallos3)
5+
archs=(rmallos2 rm1os3 rm2os3)
66
pkgnames=(toltec-deletions)
77
pkgdesc="Metapackage to handle package deletions between OS versions"
88
url=https://toltec-dev.org/
9-
pkgver=0.1-4
9+
pkgver=0.1-5
1010
timestamp=2023-12-03T04:51:58Z
1111
section="utils"
1212
maintainer="Eeems <[email protected]>"
1313
license=MIT
1414
installdepends=(toltec-bootstrap)
1515
conflicts_rmallos2=()
1616
replaces_rmallos2=()
17-
conflicts_rmallos3=(
17+
conflicts_rm1os3=(
18+
ddvk-hacks
19+
fuse
20+
wireguard
21+
innernet-client
22+
gocryptfs
23+
linux-mainline
24+
remarkable-stylus
25+
)
26+
replaces_rm1os3=(
27+
ddvk-hacks
28+
fuse
29+
wireguard
30+
innernet-client
31+
gocryptfs
32+
linux-mainline
33+
remarkable-stylus
34+
)
35+
conflicts_rm2os3=(
1836
ddvk-hacks
1937
fuse
2038
wireguard
@@ -24,7 +42,7 @@ conflicts_rmallos3=(
2442
remarkable-stylus
2543
open-remarkable-shutdown
2644
)
27-
replaces_rmallos3=(
45+
replaces_rm2os3=(
2846
ddvk-hacks
2947
fuse
3048
wireguard

‎package/webinterface-upload-button/package

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=("webinterface-upload-button")
66
pkgdesc="A simple upload button for the web interface"
77
url="https://github.com/rM-self-serve/webinterface-upload-button"
8-
pkgver=1.1.1-2
8+
pkgver=1.1.1-3
99
timestamp=2023-12-16T15:35:49Z
1010
section="utils"
1111
maintainer="rM-self-serve <[email protected]>"
@@ -15,7 +15,7 @@ source=(
1515
"$url"/archive/1d28b2d91c0179059017696ae5a33aa49e1e7c7d.zip
1616
)
1717
sha256sums=(
18-
99ac382e665b55c43876e8991c9dfa7f11a625d4f3ed4f35d3bc58762e04db39
18+
f967cad7607da6458cb0e307b662db66026747922f98ad19f7e2265b9cab1f47
1919
)
2020

2121
package() {

‎scripts/bootstrap/bootstrap

+36-9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
# <http://bin.entware.net/armv7sf-k3.2/installer/generic.sh>
1616
#
1717

18+
if [ -z "$BASH" ] || [[ "$(ps | awk '$1=='$$' { n=split($5,a,"/"); print a[n] }')" != "bash" ]]; then
19+
echo "bootstrap must be run with bash"
20+
exit 1
21+
fi
22+
1823
set -eEuo pipefail
1924

2025
# Path to the temporary local wget and Opkg binaries
@@ -61,26 +66,48 @@ exists-non-empty() {
6166
[[ -d $1 ]] && files="$(ls -A -- "$1")" && [[ -n $files ]]
6267
}
6368

69+
already-installed-message() {
70+
log "Toltec is already installed or partially installed"
71+
log "To re-enable Toltec after a system upgrade, run 'toltecctl reenable'"
72+
log "To reinstall Toltec, run 'toltecctl uninstall' first"
73+
}
74+
6475
# Check whether a Toltec install already exists or if conflicting files
6576
# remain from previous installs
6677
check-installed() {
67-
if [[ ! -f $toltecctl_path ]]; then
68-
return
78+
local unit_path
79+
local unit
80+
# This should mimic get-bind-mount-path as close as possible to ensure it's always
81+
# the path that an install or reenable would generate.
82+
unit_path="/lib/systemd/system/$(systemd-escape --path /opt).mount"
83+
unit="$(basename "$unit_path")"
84+
if [[ -f $unit_path ]] && systemctl --quiet is-active "$unit" 2> /dev/null; then
85+
log ERROR "opt.mount is currently active"
86+
already-installed-message
87+
exit 1
6988
fi
70-
71-
if exists-non-empty /opt || exists-non-empty /home/root/.entware; then
72-
log "Toltec is already installed or partially installed"
73-
log "To re-enable Toltec after a system upgrade, run 'toltecctl reenable'"
74-
log "To reinstall Toltec, run 'toltecctl uninstall' first"
89+
if [[ "$(grep ' /opt ' /proc/mounts)" != "" ]]; then
90+
log ERROR "/opt is currently mounted"
91+
already-installed-message
92+
exit 1
93+
fi
94+
if exists-non-empty /opt; then
95+
log ERROR "/opt exists and is not empty"
96+
already-installed-message
97+
exit 1
98+
fi
99+
if exists-non-empty /home/root/.entware; then
100+
log ERROR "/home/root/.entware exists and is not empty"
101+
already-installed-message
75102
exit 1
76103
fi
77104
}
78105

79106
# Install a local wget binary which supports TLS (the original one
80107
# installed on the reMarkable does not) in the PATH
81108
wget-bootstrap() {
82-
local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1
83-
local wget_checksum=8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc
109+
local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1
110+
local wget_checksum=c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5
84111

85112
if [[ ! -x $wget_path ]]; then
86113
if [[ -e $wget_path ]]; then

‎scripts/toltec/builder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def _fetch_sources(
219219

220220
# Verify checksum
221221
file_sha = util.file_sha256(local_path)
222-
if source.checksum not in ("SKIP", source.checksum):
222+
if source.checksum not in ("SKIP", file_sha):
223223
raise BuildError(
224224
f"Invalid checksum for source file {source.url}:\n"
225225
f" expected {source.checksum}\n"

0 commit comments

Comments
 (0)