Merge branch 'testing' into package/perf/initial

Author: Eeems

.github/actions/setup/action.yml

@@ -67,6 +67,10 @@ runs:
                 sudo chown root:root shellcheck
                 sudo mv shellcheck "$install_dir"
             fi
+        - name: Setup Python
+          uses: actions/setup-python@v4
+          with:
+            python-version: '3.10'
         - name: Cache Python environment
           uses: actions/cache@v3
           id: cache-python
@@ -80,5 +84,6 @@ runs:
           run: |
             if [[ "$CACHE_HIT" != 'true' ]]; then
                 python -m pip install --upgrade pip
+                pip install wheel
                 pip install -r requirements.txt
             fi

.github/workflows/pr.yml

@@ -8,10 +8,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Check formatting
@@ -25,10 +21,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

.github/workflows/stable.yml

@@ -10,10 +10,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

.github/workflows/testing.yml

@@ -10,10 +10,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

docs/building.md

@@ -18,7 +18,7 @@ Before running the build, make sure you have all the required dependencies:
 
 * Docker
 * bsdtar
-* Python ⩾ 3.8
+* Python 3.10
 
 You’ll also need all the Python modules listed in [requirements.txt](../requirements.txt) (install them by running `pip install --user -r requirements.txt` or using a [virtual environment](https://docs.python.org/3/tutorial/venv.html)).
 

package/7zip/package

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+pkgnames=(7zip)
+pkgdesc="A file archiver with a high compression ratio."
+url="https://www.7-zip.org/"
+section="util"
+pkgver=22.01-1
+timestamp=2022-07-15T00:00:00Z
+maintainer="Eeems <eeems@eeems.email>"
+license=LGPL-2.1-or-later
+source=(
+    https://www.7-zip.org/a/7z2201-linux-arm.tar.xz
+)
+sha256sums=(
+    428c11efd91fe1809c4750e8cd5d6eddfbed2826d8a5399ffcacb849f0d21cf8
+)
+
+package() {
+    install -dm 755 "$pkgdir"/opt/usr/share/licenses/7zip
+    install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/7zz
+    cp -dr --no-preserve='ownership' "$srcdir"/License.txt "$pkgdir"/opt/usr/share/licenses/7zip
+}

package/display/package

@@ -4,11 +4,11 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2022-10-28T15:36:16Z
+timestamp=2023-04-16T20:53:38Z
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.27-1
+pkgver=1:0.0.31-2
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    f4bf553f2bc868a04452f67881d7a1053f791da7d29fecbb2c5fc4075facf282
+    c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
     SKIP
     SKIP
     SKIP
@@ -64,12 +64,19 @@ display() {
     configure() {
         if [[ $arch = rm2 ]]; then
             systemctl daemon-reload
-            systemctl enable rm2fb --now
-            # Restart xochitl if it's running
-            if systemctl --quiet is-active xochitl; then
-                # Reset the crash count so we don't trigger remarkable-fail
-                echo "0" > /tmp/crashnum
-                systemctl restart xochitl
+            if systemctl enable rm2fb --now; then
+                # Restart xochitl if it's running
+                if systemctl --quiet is-active xochitl; then
+                    # Reset the crash count so we don't trigger remarkable-fail
+                    echo "0" > /tmp/crashnum
+                    systemctl restart xochitl
+                fi
+            else
+                systemctl disable rm2fb --now
+                echo "Failed to start rm2fb. Keeping it disabled for now."
+                echo "Please check the logs and open an issue:"
+                echo "  https://github.com/toltec-dev/toltec/issues/new"
+                exit 1
             fi
         fi
     }

package/fbink/package

@@ -4,8 +4,8 @@
 
 pkgnames=(fbink fbdepth fbink-doom)
 url=https://github.com/NiLuJe/FBInk
-pkgver=1.24.0-1
-timestamp=2021-03-25T23:41:13Z
+pkgver=1.25.0-1
+timestamp=2022-12-05T02:50:38Z
 maintainer="Mattéo Delabre <spam@delab.re>"
 license=GPL-3.0
 installdepends=(display)

package/kernelctl/package

@@ -5,7 +5,7 @@
 pkgnames=(kernelctl)
 pkgdesc="Manage aftermarket kernels"
 url=https://toltec-dev.org/
-pkgver=0.1-5
+pkgver=0.1-6
 timestamp=2022-11-12T00:00Z
 section="utils"
 maintainer="Salvatore Stella <etn45p4m@gmail.com>"
@@ -31,3 +31,18 @@ configure() {
         kernelctl backup vanilla
     fi
 }
+
+preremove() {
+    if [[ "$(kernelctl show | tail -n 1 | grep "vanilla-$(< /etc/version)")" == "" ]]; then
+        if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
+            echo "Unable to restore default kernel."
+            echo "To force removal, you can run the following:"
+            echo "  opkg remove --force-remove kernelctl"
+            echo "Warning: This will not leave you in a stock state"
+            exit 1
+        else
+            echo "Restoring default kernel"
+            kernelctl set default
+        fi
+    fi
+}

package/koreader/package

@@ -5,8 +5,8 @@
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2022.08-1
-timestamp=2022-07-31T13:31:10Z
+pkgver=2023.06.1-1
+timestamp=2023-07-09T08:17:26Z
 section="readers"
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
     koreader
 )
 sha256sums=(
-    57abc32b2af8c5d7765cf24fba8127a3dba9272d44d8abdc38311d8888d62ef6
+    a24f334983060b5cfee7b87484529b77fe4adffd646e8fd55447750e73309ef0
     SKIP
     SKIP
     SKIP
@@ -44,6 +44,11 @@ package() {
 }
 
 configure() {
+    # This file can cause issues with startup when moving from 2022.08 to another version
+    if [ -f /opt/koreader/cache/fontlist/fontinfo.dat ]; then
+        rm /opt/koreader/cache/fontlist/fontinfo.dat
+    fi
+
     systemctl daemon-reload
 
     if ! is-enabled "$pkgname.service"; then