Merge branch 'testing' into upower

Author: Eeems

.github/workflows/pr-labels.yml

@@ -5,7 +5,7 @@ on:
 jobs:
     check-labels:
         name: Check that PRs against the stable branch are labelled correctly
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Check labels
               run: |

.github/workflows/pr.yml

@@ -4,7 +4,7 @@ on:
 jobs:
     lint:
         name: Check that it conforms to the style guide
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
@@ -16,15 +16,15 @@ jobs:
               run: make lint
     pr:
         name: Check that it builds without error
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         needs: lint
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages
-              run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
+              run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
             - name: Save the build output
               uses: actions/upload-artifact@v3
               with:

.github/workflows/stable.yml

@@ -6,7 +6,7 @@ on:
 jobs:
     stable:
         name: Build and publish the stable channel
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3

.github/workflows/testing.yml

@@ -6,7 +6,7 @@ on:
 jobs:
     testing:
         name: Build and publish the testing channel
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3

Makefile

@@ -6,6 +6,10 @@ RECIPES=$(shell ls package/)
 RECIPES_PUSH=$(foreach app, $(RECIPES), $(app)-push)
 RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean)
 
+ifeq ($(RUNNER_DEBUG), 1)
+FLAGS+= --verbose
+endif
+
 define USAGE
 Building packages:
 

package/7zip/package

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021 The Toltec Contributors
+# Copyright (c) 2023 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
+section="utils"
+pkgver=23.01-1
+timestamp=2023-06-20T00:00:00Z
 maintainer="Eeems <[email protected]>"
 license=LGPL-2.1-or-later
 source=(
-    https://www.7-zip.org/a/7z2201-linux-arm.tar.xz
+    https://www.7-zip.org/a/7z2301-linux-arm.tar.xz
 )
 sha256sums=(
-    428c11efd91fe1809c4750e8cd5d6eddfbed2826d8a5399ffcacb849f0d21cf8
+    9d67650982f819d7557c27dea748fa66ca6c04a3a1148d66716c463580b0550c
 )
 
 package() {

package/bottom/package

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(bottom)
+pkgdesc="Cross-platform graphical process/system monitor"
+url=https://github.com/ClementTsang/bottom
+pkgver=0.9.6-1
+timestamp=2023-08-26T14:43Z
+section="utils"
+maintainer="gbyl <[email protected]>"
+license=MIT
+
+image=rust:v3.1
+source=("https://github.com/ClementTsang/bottom/archive/refs/tags/${pkgver%-*}.zip")
+sha256sums=(38c1a544ceeac4792f8e4acbf3adbf0a6d7a935afb7ef9121aaba1e7ed25cea3)
+
+build() {
+    cargo build --release
+}
+
+package() {
+    install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/btm "$pkgdir"/opt/bin/btm
+}

package/folly/package

@@ -5,13 +5,13 @@
 pkgnames=(folly)
 pkgdesc="Z-machine interpreter for interactive fiction"
 url="https://github.com/bkirwi/folly"
-pkgver=0.0.1-3
+pkgver=0.0.1-4
 timestamp=2022-04-18T17:50:16Z
 section=games
 maintainer="Ben Kirwin <[email protected]>"
 license=MIT
 installdepends=(display)
-makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
+makedepends=(build:libclang-14-dev build:clang-14 build:llvm-14-dev)
 
 image=rust:v2.3
 

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=2023.10-2
-timestamp=2023-10-30T17:19:28Z
+pkgver=2024.01-1
+timestamp=2024-01-11T17:16:35Z
 section="readers"
 maintainer="raisjn <[email protected]>"
 license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
     koreader
 )
 sha256sums=(
-    fdb72bdb80c74b6c955ffde8852ce67b77ebc7d88ceb4a439b622aff74ad858e
+    2616c7f0c63d54810f4ec78477ecb5dac2443990c7d2c8188c577ad5d925cca1
     SKIP
     SKIP
     SKIP

package/lf/package

@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022 The Toltec Contributors
+# Copyright (c) 2023 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 pkgnames=(lf)
 pkgdesc="Terminal file manager"
 url=https://github.com/gokcehan/lf
-pkgver=r27-1
-timestamp=2022-04-02T09:40Z
+pkgver=r31-2
+timestamp=2023-09-17T12:55Z
 section="utils"
 maintainer="gbyl <[email protected]>"
 license=MIT
+installdepends=(libncurses-dev)
 
-image=golang:v2.3
-source=("https://github.com/gokcehan/lf/archive/refs/tags/r27.zip")
-sha256sums=(a4f7b3ada4aa1348b7f102374d8580b6992977f7e84053aa04ef6aadb69dc205)
+image=golang:v3.1
+source=("https://github.com/gokcehan/lf/archive/refs/tags/${pkgver%-*}.zip")
+sha256sums=(217e152f09ae0cc8ab8f12fd92f705dd12630907de2b6a78ffc2727950921f97)
 
 build() {
     export GOARCH=arm

package/linux-stracciatella/package

@@ -6,8 +6,8 @@ archs=(rm1 rm2)
 pkgnames=(linux-stracciatella)
 pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
 url=https://github.com/Etn40ff/linux-remarkable
-pkgver=5.4.70-3
-timestamp=2023-09-23T00:12:00Z
+pkgver=5.4.70.4-1
+timestamp=2023-12-28T22:42:42Z
 section="kernel"
 maintainer="Salvatore Stella <[email protected]>"
 makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod)
@@ -17,11 +17,11 @@ installdepends=(kernelctl)
 image=base:v3.1
 _wireguard_version=1.0.20220627
 source=(
-    https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
+    "https://github.com/Etn40ff/linux-remarkable/archive/refs/tags/${pkgver%-*}.tar.gz"
     "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
 )
 sha256sums=(
-    2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
+    29fd9d7adcb243b841d3577088dd2aec6106eaaa3bc51440411f49ea50658c01
     362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
 )
 noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")

package/move-logs-to-opt/package

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(move-logs-to-opt)
+pkgdesc="Move log files to /opt to save space on the root partition"
+url=https://github.com/toltec-dev/toltec
+pkgver=0.0.1-1
+timestamp=2024-01-07T23:55Z
+section="utils"
+maintainer="Eeems <[email protected]>"
+license=MIT
+
+source=(var-log.mount)
+sha256sums=(SKIP)
+
+package() {
+    mkdir -p "$pkgdir"/opt/var/log
+    install -D -m 644 -t "$pkgdir"/lib/systemd/system/ "$srcdir"/var-log.mount
+}
+
+configure() {
+    systemctl daemon-reload
+    if is-active systemd-journald.service; then
+        journalctl --sync --flush
+        systemctl stop systemd-journald.service
+    fi
+    if ! mountpoint -q /var/log; then
+        echo "Moving log files to new location"
+        local target_path=/home/root/.entware/var/log
+        mkdir -p "$target_path"
+        cp -af "/var/log/." "$target_path"
+        rm -rf "/var/log/"*
+    fi
+    if ! is-enabled "var-log.mount"; then
+        systemctl enable "var-log.mount"
+    fi
+    systemctl restart "var-log.mount"
+    systemctl start systemd-journald.service
+}
+
+preremove() {
+    if is-active systemd-journald.service; then
+        journalctl --sync --flush
+        systemctl stop systemd-journald.service
+    fi
+    disable-unit "var-log.mount"
+}
+
+postremove() {
+    systemctl daemon-reload
+    systemctl start systemd-journald.service
+    if mountpoint -q /var/log; then
+        umount -l /var/log
+    fi
+}

package/move-logs-to-opt/var-log.mount

@@ -0,0 +1,15 @@
+[Unit]
+Description=Bind mount '/home/root/.entware/var/log' over '/var/log'
+DefaultDependencies=no
+Conflicts=umount.target
+Before=local-fs.target umount.target systemd-journald.service
+After=home.mount
+
+[Mount]
+What=/home/root/.entware/var/log
+Where=/var/log
+Type=none
+Options=bind
+
+[Install]
+WantedBy=local-fs.target