Merge branch 'testing' into package/perf/initial

Author: Eeems

.github/actions/setup/action.yml

@@ -8,7 +8,7 @@ runs:
             sudo apt-get update -yq
             echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
         - name: Cache Apt packages
-          uses: actions/cache@v2
+          uses: actions/cache@v3
           id: cache-apt
           with:
             path: ~/.aptcache
@@ -26,7 +26,7 @@ runs:
                 sudo cp --verbose --force --recursive ~/.aptcache/* /
             fi
         - name: Cache shfmt
-          uses: actions/cache@v2
+          uses: actions/cache@v3
           with:
             path: /usr/local/bin/shfmt
             key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
@@ -44,7 +44,7 @@ runs:
                 sudo chmod a+x "$install_dir"/shfmt
             fi
         - name: Cache Shellcheck
-          uses: actions/cache@v2
+          uses: actions/cache@v3
           with:
             path: /usr/local/bin/shellcheck
             key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
@@ -68,7 +68,7 @@ runs:
                 sudo mv shellcheck "$install_dir"
             fi
         - name: Cache Python environment
-          uses: actions/cache@v2
+          uses: actions/cache@v3
           id: cache-python
           with:
             path: ${{ env.pythonLocation }}

.github/workflows/pr.yml

@@ -7,9 +7,9 @@ jobs:
         runs-on: ubuntu-20.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
             - name: Setup Python
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v4
               with:
                 python-version: '3.8'
             - name: Setup Toltec dependencies
@@ -24,17 +24,17 @@ jobs:
         needs: lint
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
             - name: Setup Python
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v4
               with:
                 python-version: '3.8'
             - 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 }}'
             - name: Save the build output
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v3
               with:
                 name: repo
                 path: build/repo

.github/workflows/stable.yml

@@ -9,9 +9,9 @@ jobs:
         runs-on: ubuntu-20.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
             - name: Setup Python
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v4
               with:
                 python-version: '3.8'
             - name: Setup Toltec dependencies

.github/workflows/testing.yml

@@ -9,9 +9,9 @@ jobs:
         runs-on: ubuntu-20.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
             - name: Setup Python
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v4
               with:
                 python-version: '3.8'
             - name: Setup Toltec dependencies

package/ddvk-hacks/package

@@ -6,15 +6,15 @@ archs=(rm1 rm2)
 pkgnames=(ddvk-hacks)
 pkgdesc="Enhance Xochitl with additional features"
 url=https://github.com/ddvk/remarkable-hacks
-pkgver=38.03-1
-timestamp=2022-10-18T16:35:20Z
+pkgver=39.01-1
+timestamp=2022-11-09T18:31:51Z
 section="readers"
 maintainer="Mattéo Delabre <[email protected]>"
 license=MIT
 flags=(nostrip)
 
-source=(https://github.com/ddvk/remarkable-hacks/archive/49a6117b2a9ae3d5116069670702e7aa28ed1584.zip)
-sha256sums=(099d65801eda0e38a7f65a40659d32d1b37239deb2a3c4a896e37a7ed0b4f0a4)
+source=(https://github.com/ddvk/remarkable-hacks/archive/90e7e3e7ffc269373de191085453be50c9f8da0c.zip)
+sha256sums=(d3b1413bb9219804581afab598e7f5308233e7467d64e8084e67aae7346beaba)
 
 _patches_dir="/opt/share/ddvk-hacks"
 _xochitl_path="/usr/bin/xochitl"
@@ -42,6 +42,7 @@ package() {
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm1/patch_36.1.01
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm1/patch_37.1.01
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21501067_rm1/patch_38.1.03
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21511189_rm1/patch_39.1.01
     elif [[ $arch = rm2 ]]; then
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26171_rm2/patch_19.2.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26275_rm2/patch_20.2.03
@@ -63,6 +64,7 @@ package() {
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm2/patch_36.2.01
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm2/patch_37.2.01
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21501067_rm2/patch_38.2.03
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21511189_rm2/patch_39.2.01
     fi
 }
 
@@ -76,6 +78,11 @@ configure() {
     if [[ $arch = rm1 ]]; then
         device="reMarkable 1"
         case "$build_date" in
+            "20221026103859")
+                patch_version="39.1.01"
+                original_hash="1c01bae469a2e29846c68758e2cae4a2b8b5055d"
+                xochitl_version="2.15.1.1189"
+                ;;
             "20221003074737")
                 patch_version="38.1.03"
                 original_hash="a3ce408c8a717d48746e361336532924f5ff40f2"
@@ -172,6 +179,11 @@ configure() {
     elif [[ $arch = rm2 ]]; then
         device="reMarkable 2"
         case "$build_date" in
+            "20221026104022")
+                patch_version="39.2.01"
+                original_hash="64e3cb3d05aec4a40624ebfc730e480358e1b184"
+                xochitl_version="2.15.1.1189"
+                ;;
             "20221003075633")
                 patch_version="38.2.03"
                 original_hash="fcd3c84215c5457d455419831760304736f3b694"

package/kernelctl/force_reinstall_on_toltecctl_reenable

@@ -25,6 +25,7 @@ help() {
 		${bf}    list                    ${sf}List available kernels.
 		${bf}    show                    ${sf}Show the current configured kernel.
 		${bf}    delete <kernel>         ${sf}Delete kernel from the staging dir. WARNING this is irreversible.
+		${bf}    prune                   ${sf}Delete all backups of vanilla kernels older than the one that shipped with the current software version. WARNING this is irreversible.
 		${bf}    set <kernel>            ${sf}Change booting kernel.
 
 		${bf}        <kernel>            ${sf}Kernel name or number (from 'list' command) or "default" to revert to the upstram kernel.
@@ -66,7 +67,11 @@ get_kernel_names() {
 
 # get current kernel
 get_current_kernel_name() {
-    current_kernel_name=$(find "$kernelctl_dir" -samefile "$kernelctl_dir"/current.tar.bz2 ! -name current.tar.bz2 -print0 | xargs -0 -I"{}" basename {} .tar.bz2)
+    if [[ -e "$kernelctl_dir"/current.tar.bz2 ]]; then
+        current_kernel_name=$(find "$kernelctl_dir" -samefile "$kernelctl_dir"/current.tar.bz2 ! -name current.tar.bz2 -print0 | xargs -0 -I"{}" basename {} .tar.bz2)
+    else
+        current_kernel_name=''
+    fi
 }
 
 # translate input into a kernel name
@@ -103,8 +108,12 @@ list() {
 # show the current configured kernel
 show() {
     get_current_kernel_name
-    echo -e "${gr}Current kernel:${sf}"
-    echo -e "  ${bf}${current_kernel_name}${sf}"
+    if [[ "$current_kernel_name" = "" ]]; then
+        echo -e "${bf}There is no link to the current running kernel in the staging area.${sf}"
+    else
+        echo -e "${gr}Current kernel:${sf}"
+        echo -e "  ${bf}${current_kernel_name}${sf}"
+    fi
 }
 
 # actually switch kernels
@@ -171,6 +180,18 @@ delete() {
     fi
 }
 
+prune() {
+    echo "Deleting backups of old vanilla kernel(s) from the staging area is irreversible."
+    echo -n "Do you want to proceed? [N/y]: "
+    read -r ans
+    if [[ "$ans" = "y" || "$ans" = "Y" ]]; then
+        mapfile -t filenames < <(find "$kernelctl_dir" -path "*vanilla-*.tar.bz2" ! -name vanilla-"$(< /etc/version)".tar.bz2)
+        for filename in "${filenames[@]}"; do
+            rm "$filename"
+        done
+    fi
+}
+
 if [[ $0 = "${BASH_SOURCE[0]}" ]]; then
     if [[ $# -eq 0 ]]; then
         help
@@ -211,6 +232,9 @@ if [[ $0 = "${BASH_SOURCE[0]}" ]]; then
             fi
             delete "$1"
             ;;
+        prune)
+            prune
+            ;;
         *)
             echo -e "Error: Invalid command '$action'\n"
             help

package/kernelctl/kernelctl

@@ -5,37 +5,29 @@
 pkgnames=(kernelctl)
 pkgdesc="Manage aftermarket kernels"
 url=https://toltec-dev.org/
-pkgver=0.1-2
-timestamp=2022-03-14T00:00Z
+pkgver=0.1-5
+timestamp=2022-11-12T00:00Z
 section="utils"
 maintainer="Salvatore Stella <[email protected]>"
 license=MIT
 
 source=(
     kernelctl
-    force_reinstall_on_toltecctl_reenable
 )
 sha256sums=(
     SKIP
-    SKIP
 )
 
 package() {
+    touch "$srcdir"/emptyfile
     install -D -m 744 -t "$pkgdir"/opt/bin "$srcdir"/kernelctl
     install -d "$pkgdir"/opt/usr/share/kernelctl
-    install -D -m 666 -t "$pkgdir"/usr/share/kernelctl/ "$srcdir"/force_reinstall_on_toltecctl_reenable
+    install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/kernelctl "$srcdir"/emptyfile
 }
 
 configure() {
     if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
-        read -r -d '' msg <<- EOM
-		It looks like there is no backup of the upstream kernel for the
-		installed version of codex.
-
-		Please standby while one is produced (assuming that the
-		currently running kernel is upstream).
-	EOM
-        echo -e "$msg"
+        echo "Creating a backup of the currently running kernel."
         kernelctl backup vanilla
     fi
 }

package/kernelctl/package

@@ -6,7 +6,7 @@ archs=(rm2)
 pkgnames=(linux-mainline)
 pkgdesc="reMarkable 2 kernel based on the mainline kernel"
 url=https://www.kernel.org
-pkgver=5.19.0-1
+pkgver=6.0.0-1
 timestamp=2022-05-22T21:50:09Z
 section=kernel
 maintainer="Alistair Francis <[email protected]>"
@@ -15,8 +15,8 @@ license=GPL-2.0-only
 flags=(nostrip)
 
 image=base:v2.3
-source=("https://github.com/alistair23/linux/archive/6df274810d20448125834115e2181de288fdc8a4.tar.gz")
-sha256sums=(a7538198dbef21868d2c52e8b379576c8791726809bd5886176ab88d1f9df49f)
+source=("https://github.com/alistair23/linux/archive/4c2ef4e3bba89a8d767eccb85a242b2cd8850146.tar.gz")
+sha256sums=(1583d553380a656ecaac8dab89558051e9165983381adc9c3d52fb8ac0ce19fd)
 
 build() {
     ARCH=arm make imx_v6_v7_defconfig

package/linux-mainline/package

@@ -3,16 +3,22 @@
 # SPDX-License-Identifier: MIT
 
 pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry)
-pkgver=2.4-1
+pkgver=2.4-2
 _sentryver=0.4.17
 timestamp=2022-05-22T03:18:32Z
 maintainer="Eeems <[email protected]>"
 url=https://oxide.eeems.codes
 license=MIT
 flags=(patch_rm2fb)
 image=qt:v2.3
-source=("https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz")
-sha256sums=(a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee)
+source=(
+    "https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz"
+    toltec-override.conf
+)
+sha256sums=(
+    a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee
+    SKIP
+)
 
 build() {
     find . -name "*.pro" -type f -print0 \
@@ -84,6 +90,8 @@ tarnish() {
         install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf
         install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish
+        install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
+            "$srcdir"/toltec-override.conf
     }
     configure() {
         systemctl daemon-reload

package/oxide/package

@@ -0,0 +1,6 @@
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+[Unit]
+Conflicts=xochitl.service
+Conflicts=sync.service

package/oxide/toltec-override.conf

@@ -6,8 +6,8 @@ archs=(rm1 rm2)
 pkgnames=(toltec-base)
 pkgdesc="Metapackage defining the base set of packages in a Toltec install"
 url=https://toltec-dev.org/
-pkgver=1.0-1
-timestamp=2022-02-28T00:12Z
+pkgver=1.1-1
+timestamp=2022-11-07T20:19:57Z
 section="utils"
 maintainer="Eeems <[email protected]>"
 license=MIT
@@ -19,5 +19,15 @@ source=()
 sha256sums=()
 
 package() {
-    true
+    touch "$srcdir"/emptyfile
+    install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/toltec-base "$srcdir"/emptyfile
+}
+
+configure() {
+    if is-enabled "update-engine.service"; then
+        echo "Disabling automatic update"
+        systemctl disable --now update-engine
+    fi
+    echo "Disabling usb1 network device to avoid long boots"
+    systemctl mask sys-subsystem-net-devices-usb1.device
 }

package/toltec-base/package

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+killall xochitl

package/xochitl/kill-xochitl

@@ -0,0 +1,21 @@
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+[Unit]
+Description=reMarkable Document Sync without the xochitl.service dependency
+After=dbus.socket
+StartLimitIntervalSec=60
+StartLimitBurst=4
+Conflicts=sync.service
+
+[Service]
+# Do NOT make this dbus, systemd will kill the service when it should be
+# running otherwise.
+Type=simple
+BusName=no.remarkable.sync
+ExecStart=/usr/bin/sync --service
+Restart=on-failure
+RestartForceExitStatus=SIGHUP SIGINT SIGTERM SIGPIPE
+
+[Install]
+WantedBy=multi-user.target