Skip to content

Commit 9d15d2d

Browse files
EeemsEeems
authored
Stable merge for week 5 of 2025 (#937)
### New Packages - `debian-chroot` - 0.0.0-1 (#799) - `debootstrap` - 1.0.133-1 (#799) - `keyd` - 2.4.3-1 (#744) ### Updated Packages - `koreader` - 2024.11-1 (#930) - `sysfs_preload` 1.0.3-1 (#936) - `zerotier` - 1:1.14.2 (#928) - `zerotier-one`, `zerotier-one-doc`, and `zerotier-selftest` - 1.14.2 (#928) - `oxide`, `oxide-extra`, `oxide-utils`, `inject_evdev`, `liboxide`, and `liboxide-dev` - 2.8.4-2 (#938) ### Tooling - Bootstrap now properly detects and errors if run on an unsupported architecture (#933)
1 parent 8f00e88 commit 9d15d2d

File tree

9 files changed

+171
-13
lines changed

9 files changed

+171
-13
lines changed

‎package/debian-chroot/debian-chroot.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chroot_path="/home/root/.local/share/debian"

‎package/debian-chroot/package

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2023 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
5+
pkgnames=(debian-chroot debootstrap)
6+
section="utils"
7+
# Each package has it's own timestamp override below
8+
timestamp=2023-12-22T19:37Z
9+
maintainer="Eeems <[email protected]>"
10+
installdepends=(display)
11+
flags=(nostrip)
12+
13+
source=(
14+
https://github.com/Eeems-org/remarkable-debian-chroot/archive/ea12a1bf851f412e8df4b59fe072bce26bb72571.zip
15+
https://salsa.debian.org/installer-team/debootstrap/-/archive/1.0.133/debootstrap-1.0.133.tar.gz
16+
debian-chroot.conf
17+
)
18+
sha256sums=(
19+
3fcd571ba1aa1a5c55a32767c34e6939e0c0e8ad9213425c6d66d25300fe24b8
20+
734af3492eea99de940853e2c00e1a9ebd65c463362155f613aa24b9cc3336a0
21+
SKIP
22+
)
23+
24+
debian-chroot() {
25+
pkgdesc="A minimal Debian chroot for the reMarkable tablet"
26+
url=https://github.com/Eeems-Org/remarkable-debian-chroot
27+
pkgver=0.0.0-1
28+
timestamp=2023-12-22T19:37Z
29+
license=MIT
30+
installdepends=(debootstrap lsof)
31+
package() {
32+
install -D -m 755 \
33+
"$srcdir"/bin/debian-chroot \
34+
"$pkgdir"/opt/bin/debian-chroot
35+
install -D -m 655 \
36+
"$srcdir"/debian-chroot.conf \
37+
"$pkgdir"/home/root/.config/debian-chroot.conf
38+
mkdir -p "$pkgdir"/opt/etc/
39+
ln -s /home/root/.config/debian-chroot.conf \
40+
"$pkgdir"/opt/etc/debian-chroot.conf
41+
source "$srcdir"/debian-chroot.conf
42+
mkdir -p "$pkgdir"/opt/lib/
43+
ln -s "$chroot_path" "$pkgdir"/opt/lib/debian-chroot
44+
}
45+
configure() {
46+
# Force debian chroot to install iteself
47+
debian-chroot true
48+
}
49+
preremove() {
50+
source /home/root/.config/debian-chroot.conf
51+
if lsof "$chroot_path" 2> /dev/null | grep "$chroot_path"; then
52+
echo "Error: debian-chroot has running processes"
53+
exit 1
54+
fi
55+
if grep -q "$chroot_path " /proc/mounts; then
56+
/bin/umount -R "$chroot_path"
57+
fi
58+
cp /home/root/.config/debian-chroot.conf /tmp/_debian-chroot.conf
59+
}
60+
postremove() {
61+
source /tmp/_debian-chroot.conf
62+
rm -rf "$chroot_path"
63+
rm /tmp/_debian-chroot.conf
64+
}
65+
}
66+
67+
debootstrap() {
68+
pkgdesc="debootstrap is a tool which will install a Debian base system into a subdirectory of another, already installed system."
69+
installdepends=(perl ar)
70+
url=https://wiki.debian.org/Debootstrap
71+
pkgver=1.0.133-1
72+
timestamp=2023-10-21T11:38Z
73+
license=MIT
74+
package() {
75+
cd "$srcdir"
76+
sed -i 's|/usr/sbin|/sbin|' Makefile
77+
make DESTDIR="$pkgdir"/opt install
78+
sed -i 's|DEBOOTSTRAP_DIR=/usr/share/debootstrap|DEBOOTSTRAP_DIR=/opt/usr/share/debootstrap|' "$pkgdir"/opt/sbin/debootstrap
79+
}
80+
}

‎package/keyd/default.conf

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[ids]
2+
# 2edd:0001 # type folio
3+
4+
[main]

‎package/keyd/package

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2020 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
5+
archs=(rmallos3)
6+
pkgnames=(keyd)
7+
pkgdesc="A key remapping daemon for linux"
8+
url="https://github.com/rvaiya/keyd"
9+
pkgver=2.4.3-1
10+
timestamp=2023-05-16T10:11Z
11+
section=utils
12+
maintainer="Kai <[email protected]>"
13+
license=MIT
14+
15+
image=base:v3.1
16+
source=(
17+
https://github.com/rvaiya/keyd/archive/refs/tags/v2.4.3.zip
18+
default.conf
19+
)
20+
sha256sums=(
21+
cdfcc2cf0518b9a2d292ebac17b18f78548b92803e2a9deeb9f18c9641bf80e5
22+
SKIP
23+
)
24+
25+
build() {
26+
make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd "CC=${CROSS_COMPILE}cc"
27+
sed -i 's|ExecStart=/usr/bin/keyd|ExecStart=/opt/bin/keyd|' keyd.service
28+
}
29+
30+
package() {
31+
cd "$srcdir"
32+
make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd DESTDIR="$pkgdir" install
33+
rmdir "$pkgdir"/etc/keyd
34+
install -D -m 644 -t "$pkgdir"/etc/systemd/system "$srcdir"/keyd.service
35+
install -D -m 644 -t "$pkgdir"/opt/etc/keyd "$srcdir"/default.conf
36+
}
37+
38+
configure() {
39+
addgroup keyd
40+
systemctl daemon-reload
41+
if is-active keyd; then
42+
systemctl restart keyd
43+
elif ! is-enabled "$pkgname.service"; then
44+
echo ""
45+
echo "Run the following command(s) to enable the keyd service"
46+
how-to-enable "$pkgname.service"
47+
echo ""
48+
echo "You will need to modify /opt/etc/keyd/default.conf before starting the service"
49+
fi
50+
}
51+
52+
preremove() {
53+
disable-unit keyd
54+
delgroup keyd
55+
}
56+
57+
postremove() {
58+
systemctl daemon-reload
59+
}

‎package/koreader/package

+3-3
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=2024.07-1
9-
timestamp=2024-07-15T16:21:26Z
8+
pkgver=2024.11-1
9+
timestamp=2024-11-20T19:52:06Z
1010
section="readers"
1111
maintainer="raisjn <[email protected]>"
1212
license=AGPL-3.0-or-later
@@ -22,7 +22,7 @@ source=(
2222
launcherctl-koreader
2323
)
2424
sha256sums=(
25-
1040894434421b52076473f7947f139e2c98fcc04b1acadfe29b3362f262f9b7
25+
2b97146e38bdfeec483773e01738cd6109fadc06312b41a16328e33ad3eceae5
2626
SKIP
2727
SKIP
2828
SKIP

‎package/oxide/package

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
archs=(rm1 rm2)
66
pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry)
77
_oxidever=2.8.4
8-
pkgver=$_oxidever-2
8+
pkgver=$_oxidever-3
99
_sentryver=0.7.6
1010
timestamp=2024-06-26T22:31:46Z
1111
maintainer="Eeems <[email protected]>"
@@ -35,7 +35,7 @@ build() {
3535
oxide() {
3636
pkgdesc="Launcher application"
3737
section="launchers"
38-
installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display launcherctl)
38+
installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display launcherctl sysfs_preload)
3939
replaces=(erode tarnish decay corrupt)
4040
conflicts=(erode tarnish decay corrupt)
4141

‎package/sysfs_preload/package

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
pkgnames=(sysfs_preload)
66
pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead."
77
url="https://github.com/Eeems-Org/sysfs_preload"
8-
pkgver=1.0.1-2
9-
timestamp=2024-06-22T05:19Z
8+
pkgver=1.0.3-1
9+
timestamp=2024-10-11T04:33:10Z
1010
section=utils
1111
maintainer="Eeems <[email protected]>"
1212
license=MIT
1313

1414
image=qt:v3.1
15-
source=(https://github.com/Eeems-Org/sysfs_preload/archive/refs/tags/1.0.1.tar.gz)
16-
sha256sums=(73627b68e3b2454efcc2d83e6ebdc2eb473f9cc2616ed1b9dd2acae159c54b3d)
15+
source=(https://github.com/Eeems-Org/sysfs_preload/archive/refs/tags/1.0.3.tar.gz)
16+
sha256sums=(06a4c356e583614880c24afc2205caa3db445e3e6bd4414091545540d841a095)
1717

1818
build() {
1919
find . -name "*.pro" -type f -print0 \

‎package/zerotier-one/package

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
pkgnames=(zerotier zerotier-one zerotier-one-doc zerotier-selftest)
66
url=https://github.com/zerotier/ZeroTierOne
7-
_upver=1.14.1
7+
_upver=1.14.2
88
pkgver=${_upver}-1
9-
timestamp=2023-03-23T17:39:31Z
9+
timestamp=2024-10-29T16:17:48Z
1010
maintainer="Eeems <[email protected]>"
1111
license=BUSL-1.1
1212
section="utils"
1313
image=base:v3.0
1414

1515
source=("https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${_upver}.zip")
16-
sha256sums=(fcf30ce797dbca757f3e882e004a3f953ebe12ae13f03d804b3fb184ee3c9714)
16+
sha256sums=(529dd6d246f51ca7cb0b14794ba68560c0134409f94fcc61a3ee7f5c173c301f)
1717

1818
build() {
1919
sed -i \

‎scripts/bootstrap/bootstrap

+15-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ if [ -z "$BASH" ] || [[ "$(ps | awk '$1=='$$' { n=split($5,a,"/"); print a[n] }'
2020
exit 1
2121
fi
2222

23+
arch=""
24+
case "$(uname -m)" in
25+
"armv7l")
26+
arch="armv7sf-k3.2"
27+
;;
28+
#"aarch64)
29+
# arch="aarch64-k3.10"
30+
# ;;
31+
*)
32+
echo "Unsupported device architecture"
33+
exit 1
34+
;;
35+
esac
36+
2337
set -eEuo pipefail
2438

2539
# Path to the temporary local wget and Opkg binaries
@@ -33,7 +47,7 @@ toltecctl_path="${toltecctl_path:-/home/root/.local/bin/toltecctl}"
3347
toltec_branch="${toltec_branch:-stable}"
3448

3549
# Base URLs for bootstrapping from the Entware and Toltec repositories
36-
entware_remote="${entware_remote:-https://bin.entware.net/armv7sf-k3.2/installer}"
50+
entware_remote="${entware_remote:-https://bin.entware.net/$arch/installer}"
3751
toltec_remote="${toltec_remote:-https://toltec-dev.org/$toltec_branch/rmall}"
3852

3953
# Remove all temporary files

0 commit comments

Comments
 (0)