From 1e1cdd468de5eeaed02c7bc15100cca8530c6e5b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 3 Jun 2024 11:57:07 -0600 Subject: [PATCH 01/17] allow open-remarkable-shutdown on rm1os3 (#879) --- package/open-remarkable-shutdown/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open-remarkable-shutdown/package b/package/open-remarkable-shutdown/package index 5c31ca592..dbdec6302 100644 --- a/package/open-remarkable-shutdown/package +++ b/package/open-remarkable-shutdown/package @@ -2,11 +2,11 @@ # Copyright (c) 2021 The Toltec Contributors # SPDX-License-Identifier: MIT -archs=(rmallos2) +archs=(rmallos2 rm1os3) pkgnames=(open-remarkable-shutdown) pkgdesc="Use remarkable-splash to display shutdown and reboot images" url=https://github.com/ddvk/remarkable-splash -pkgver=1.0-2 +pkgver=1.0-3 timestamp=2022-02-28T00:12Z section="utils" maintainer="Eeems " From 1c0528346c0f925e297fc1d9f4c70b94164ece86 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 3 Jun 2024 12:36:42 -0600 Subject: [PATCH 02/17] Split toltec-deletions rm1/rm2 for open-remarkable-shutdown (#880) --- package/toltec-deletions/package | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index c3cea1e4b..9854cbcf7 100644 --- a/package/toltec-deletions/package +++ b/package/toltec-deletions/package @@ -2,11 +2,11 @@ # Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT -archs=(rmallos2 rmallos3) +archs=(rmallos2 rm1os3 rm2os3) pkgnames=(toltec-deletions) pkgdesc="Metapackage to handle package deletions between OS versions" url=https://toltec-dev.org/ -pkgver=0.1-4 +pkgver=0.1-5 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " @@ -14,7 +14,25 @@ license=MIT installdepends=(toltec-bootstrap) conflicts_rmallos2=() replaces_rmallos2=() -conflicts_rmallos3=( +conflicts_rm1os3=( + ddvk-hacks + fuse + wireguard + innernet-client + gocryptfs + linux-mainline + remarkable-stylus +) +replaces_rm1os3=( + ddvk-hacks + fuse + wireguard + innernet-client + gocryptfs + linux-mainline + remarkable-stylus +) +conflicts_rm2os3=( ddvk-hacks fuse wireguard @@ -24,7 +42,7 @@ conflicts_rmallos3=( remarkable-stylus open-remarkable-shutdown ) -replaces_rmallos3=( +replaces_rm2os3=( ddvk-hacks fuse wireguard From 80e31f471aab14672ac8d6aecd6772b2f45286ee Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 6 Jun 2024 07:56:28 +1000 Subject: [PATCH 03/17] package/linux-mainline: Bump to 6.3 (#732) * package/linux-mainline: Bump to 6.3 Signed-off-by: Alistair Francis * No longer delete linux-mainline on os3 --------- Signed-off-by: Alistair Francis Co-authored-by: Nathaniel van Diepen --- package/linux-mainline/package | 17 +++++++++-------- package/toltec-deletions/package | 6 +----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 8f8aa87da..754fa6591 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/package @@ -2,25 +2,26 @@ # Copyright (c) 2021 The Toltec Contributors # SPDX-License-Identifier: MIT -archs=(rm2os2) +archs=(rm2) pkgnames=(linux-mainline) pkgdesc="reMarkable 2 kernel based on the mainline kernel" url=https://www.kernel.org -pkgver=6.2.0-3 -timestamp=2022-05-22T21:50:09Z +pkgver=6.3.0-1 +timestamp=2023-08-23T21:50:09Z section=kernel maintainer="Alistair Francis " makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev) +installdepends=(kernelctl) license=GPL-2.0-only flags=(nostrip) image=base:v2.3 source=( - https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz + https://github.com/alistair23/linux/archive/1698a3bdd8d66e58873c5bb3ce370b7d48b004cf.tar.gz remarkable_defconfig ) sha256sums=( - de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c + 647f6a60adad8c4e37eeaf9114c037888cb33923e364bbf5dc0830b2661c21b7 f4d8cbb2c0e7bff5b151729b45064eb9e95005cb91899f0a9df038343d95ebf2 ) @@ -55,9 +56,9 @@ configure() { echo echo "Known issues with the mainline kernel:" echo " - No support for low power mode (suspend uses more power then it should)" - echo " - Device doesn't always resume from suspend, a reboot is required" - echo " - GUI shutdown in Oxide doesn't work" + echo " - Shutdown doesn't work (https://github.com/alistair23/linux/issues/4)" + echo " - Device doesn't always resume correctly from suspend, a reboot is required" echo " - Wacom stylus doesn't work in Xochitl (https://github.com/reMarkable/linux/issues/15)" - echo " - Finger input doesn't work in Koreader (https://github.com/koreader/koreader/issues/10012)" echo " - No OTG control support" + echo " - Folio does not work" } diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index 9854cbcf7..8db7bcb33 100644 --- a/package/toltec-deletions/package +++ b/package/toltec-deletions/package @@ -6,7 +6,7 @@ archs=(rmallos2 rm1os3 rm2os3) pkgnames=(toltec-deletions) pkgdesc="Metapackage to handle package deletions between OS versions" url=https://toltec-dev.org/ -pkgver=0.1-5 +pkgver=0.1-6 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " @@ -20,7 +20,6 @@ conflicts_rm1os3=( wireguard innernet-client gocryptfs - linux-mainline remarkable-stylus ) replaces_rm1os3=( @@ -29,7 +28,6 @@ replaces_rm1os3=( wireguard innernet-client gocryptfs - linux-mainline remarkable-stylus ) conflicts_rm2os3=( @@ -38,7 +36,6 @@ conflicts_rm2os3=( wireguard innernet-client gocryptfs - linux-mainline remarkable-stylus open-remarkable-shutdown ) @@ -48,7 +45,6 @@ replaces_rm2os3=( wireguard innernet-client gocryptfs - linux-mainline remarkable-stylus open-remarkable-shutdown ) From cbdb6542a80f0b321e4d5121e895f4a5fb6be329 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 5 Jun 2024 18:37:35 -0600 Subject: [PATCH 04/17] Fix invalid launcherctl status output when using remux (#882) * Fix #881 --- package/rmkit/launcherctl-remux | 4 ++-- package/rmkit/package | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rmkit/launcherctl-remux b/package/rmkit/launcherctl-remux index d0c1e5436..46538ba50 100755 --- a/package/rmkit/launcherctl-remux +++ b/package/rmkit/launcherctl-remux @@ -7,7 +7,7 @@ remux_ppid() { grep "PPid:" "/proc/$(remux_pid)/status" | awk '{print $2}' } draft_apps() { - find {/opt,}/etc/draft -maxdepth 1 -type f | while read -r file; do + find {/opt,}/etc/draft -maxdepth 1 -type f 2> /dev/null | while read -r file; do name="$(grep 'name=' "$file" | sed 's|^name=||')" call="$(grep 'call=' "$file" | sed 's|^call=||')" echo -e "${name}\t${call}" @@ -89,7 +89,7 @@ case "$1" in systemctl disable remux.service ;; apps) - find {/opt,}/etc/draft -maxdepth 1 -type f | while read -r file; do + find {/opt,}/etc/draft -maxdepth 1 -type f 2> /dev/null | while read -r file; do grep 'name=' "$file" | sed 's|^name=||' done ;; diff --git a/package/rmkit/package b/package/rmkit/package index 43db913e2..6dea62b34 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -147,7 +147,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.3.0-4 + pkgver=0.3.0-5 section="launchers" installdepends=(procps-ng-ps) From bb2d3f224ee8968fb58c8b424b34e8fd7a97b86b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 5 Jun 2024 19:02:09 -0600 Subject: [PATCH 05/17] Don't overwrite other LD_PRELOAD env values (#741) * Don't overwrite other LD_PRELOAD env values --- package/display/package | 2 +- package/display/rm2fb-preload.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/display/package b/package/display/package index 8f3bd3029..d14efd480 100644 --- a/package/display/package +++ b/package/display/package @@ -8,7 +8,7 @@ timestamp=2023-08-27T02:39:10Z maintainer="raisjn " license=MIT url="https://github.com/ddvk/remarkable2-framebuffer" -pkgver=1:0.0.33-1 +pkgver=1:0.0.33-2 _release="${pkgver%-*}" _release="v${_release#*:}" _libver=1.0.1 diff --git a/package/display/rm2fb-preload.env b/package/display/rm2fb-preload.env index 910b04299..99ec3959c 100644 --- a/package/display/rm2fb-preload.env +++ b/package/display/rm2fb-preload.env @@ -3,7 +3,7 @@ # Please do not modify files shipped by Toltec, or they risk being # overwritten with updates. Instead create your own files in this directory. if [[ -f /dev/shm/swtfb.01 ]]; then - export LD_PRELOAD=/opt/lib/librm2fb_client.so.1 + export LD_PRELOAD="$LD_PRELOAD:/opt/lib/librm2fb_client.so.1" else echo "rm2fb server is not running: starting without rm2fb client" fi From d8e8eba9b05b2c7d1719218ee9a95a85cee196a7 Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:39:44 -0500 Subject: [PATCH 06/17] Remove ripgrep (#891) * remove ripgrep from toltec --------- Co-authored-by: gbyl --- package/ripgrep/package | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 package/ripgrep/package diff --git a/package/ripgrep/package b/package/ripgrep/package deleted file mode 100644 index 88aae0388..000000000 --- a/package/ripgrep/package +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors -# SPDX-License-Identifier: MIT - -pkgnames=(ripgrep) -pkgdesc="Modern grep for recursive regex pattern searching" -url=https://github.com/BurntSushi/ripgrep -pkgver=14.0.3-1 -timestamp=2023-11-28T21:22Z -section="utils" -maintainer="gbyl " -license=MIT - -image=rust:v3.1 -source=("https://github.com/BurntSushi/ripgrep/archive/refs/tags/${pkgver%-*}.zip") -sha256sums=(eb91f202fc25d51755390736775a7e7f8e146eb97e584aaa01fb0c45aa5de654) - -build() { - cargo build --release -} - -package() { - install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/rg "$pkgdir"/opt/bin/rg -} From ee899ceeda377b88aa09b3ae9388227f4cf5b0de Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:47:00 -0500 Subject: [PATCH 07/17] Update lf to r32 (#889) * update lf to r32 --------- Co-authored-by: gbyl Co-authored-by: Nathaniel van Diepen --- package/lf/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lf/package b/package/lf/package index eae20ad5e..73e360741 100644 --- a/package/lf/package +++ b/package/lf/package @@ -1,12 +1,12 @@ #!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(lf) pkgdesc="Terminal file manager" url=https://github.com/gokcehan/lf -pkgver=r31-2 -timestamp=2023-09-17T12:55Z +pkgver=r32-1 +timestamp=2024-03-31T20:04Z section="utils" maintainer="gbyl " license=MIT @@ -14,7 +14,7 @@ installdepends=(libncurses-dev) image=golang:v3.1 source=("https://github.com/gokcehan/lf/archive/refs/tags/${pkgver%-*}.zip") -sha256sums=(217e152f09ae0cc8ab8f12fd92f705dd12630907de2b6a78ffc2727950921f97) +sha256sums=(571ee17d8181d77a3b8bcd7aaaff0bde062c1851d93e9d324dfe15948136891a) build() { export GOARCH=arm From b812d03cd8998d158a22fc2eab94d33f0f1c78e9 Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:53:39 -0500 Subject: [PATCH 08/17] Add package: bandwhich (#892) * add package: bandwhich --------- Co-authored-by: gbyl Co-authored-by: Nathaniel van Diepen --- package/bandwhich/package | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/bandwhich/package diff --git a/package/bandwhich/package b/package/bandwhich/package new file mode 100644 index 000000000..c9c1243a7 --- /dev/null +++ b/package/bandwhich/package @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Copyright (c) 2024 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(bandwhich) +pkgdesc="CLI network utilization tool" +url=https://github.com/imsnif/bandwhich +pkgver=0.22.2-1 +timestamp=2024-01-27T19:33Z +section="utils" +maintainer="gbyl " +license=MIT + +image=rust:v3.1 +source=("https://github.com/imsnif/bandwhich/archive/refs/tags/v${pkgver%-*}.zip") +sha256sums=(5d1eaa1796ec3c16f349cb6b00bd9dba6d425e9323d63af648a41cd68c5d456b) + +build() { + cargo build --release +} + +package() { + install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/bandwhich "$pkgdir"/opt/bin/bandwhich +} From e8ea1b744405863c3b93985388999b3c8769ef08 Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Sat, 8 Jun 2024 01:02:21 -0500 Subject: [PATCH 09/17] 7zip: Alias for 7-zip (#890) * Make 7zip a metapackage that installs 7-zip --------- Co-authored-by: gbyl --- package/7zip/package | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/7zip/package b/package/7zip/package index ebc6d6ad0..28a2e3275 100644 --- a/package/7zip/package +++ b/package/7zip/package @@ -1,23 +1,16 @@ #!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(7zip) -pkgdesc="A file archiver with a high compression ratio." +pkgdesc="Metapackage for 7-zip" url="https://www.7-zip.org/" section="utils" -pkgver=23.01-1 +pkgver=23.01-2 timestamp=2023-06-20T00:00:00Z maintainer="Eeems " license=LGPL-2.1-or-later -source=( - https://www.7-zip.org/a/7z2301-linux-arm.tar.xz -) -sha256sums=( - 9d67650982f819d7557c27dea748fa66ca6c04a3a1148d66716c463580b0550c -) +installdepends=(7-zip) 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 + true } From 2f13ee47197d0121946b61c6abf03c00dca17efb Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Sat, 8 Jun 2024 01:10:04 -0500 Subject: [PATCH 10/17] koreader: disable ota updates (#894) Co-authored-by: gbyl Co-authored-by: Nathaniel van Diepen --- package/koreader/package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index ff323c2e1..182d6d237 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -1,11 +1,11 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(koreader) pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats" url=https://github.com/koreader/koreader -pkgver=2024.04-4 +pkgver=2024.04-5 timestamp=2024-04-29T19:56:05Z section="readers" maintainer="raisjn " @@ -37,6 +37,7 @@ package() { rm "$pkgdir"/opt/koreader/{fbink,fbdepth} ln -s /opt/bin/fbink "$pkgdir"/opt/koreader/fbink ln -s /opt/bin/fbdepth "$pkgdir"/opt/koreader/fbdepth + sed -i 's/hasOTAUpdates = yes/hasOTAUpdates = no/' "$pkgdir"/opt/koreader/frontend/device/remarkable/device.lua install -D -m 644 -t "$pkgdir"/opt/etc/draft/ "$srcdir"/koreader.draft install -D -m 644 -t "$pkgdir"/opt/usr/share/applications/ "$srcdir"/KOReader.oxide From 28ebda4392807a00fa3c3e06134c561f33a37585 Mon Sep 17 00:00:00 2001 From: gbyl <71516803+gbyl@users.noreply.github.com> Date: Mon, 10 Jun 2024 00:31:27 -0500 Subject: [PATCH 11/17] Remove package: bottom (#897) * remove package: bottom * fix toltecctl typo * Create opt-usr-bin.sh --------- Co-authored-by: gbyl Co-authored-by: Nathaniel van Diepen --- package/bottom/package | 24 ------------------------ package/toltec-base/opt-usr-bin.sh | 3 +++ package/toltec-base/package | 8 ++++---- package/toltec-bootstrap/package | 2 +- package/toltec-bootstrap/toltecctl | 2 +- 5 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 package/bottom/package create mode 100644 package/toltec-base/opt-usr-bin.sh diff --git a/package/bottom/package b/package/bottom/package deleted file mode 100644 index 9637894de..000000000 --- a/package/bottom/package +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 " -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 -} diff --git a/package/toltec-base/opt-usr-bin.sh b/package/toltec-base/opt-usr-bin.sh new file mode 100644 index 000000000..9ff6643dc --- /dev/null +++ b/package/toltec-base/opt-usr-bin.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +export PATH=/opt/usr/bin:$PATH diff --git a/package/toltec-base/package b/package/toltec-base/package index 183cb2995..e4b0a4539 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,7 +6,7 @@ archs=(rmall rmallos2 rmallos3 rm1 rm1os2 rm1os3 rm2 rm2os2 rm2os3) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.3-4 +pkgver=1.4-1 timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " @@ -17,11 +17,11 @@ installdepends_rm1os3=(open-remarkable-shutdown) installdepends_rm2os2=(rm2-suspend-fix) installdepends_rm2os3=(rm2-suspend-fix) -source=() -sha256sums=() +source=(opt-usr-bin.sh) +sha256sums=(SKIP) package() { - true + install -D -m 755 -t "$pkgdir"/etc/profile.d/ "$srcdir"/opt-usr-bin.sh } configure() { diff --git a/package/toltec-bootstrap/package b/package/toltec-bootstrap/package index cc1d68274..90d201f50 100644 --- a/package/toltec-bootstrap/package +++ b/package/toltec-bootstrap/package @@ -5,7 +5,7 @@ pkgnames=(toltec-bootstrap) pkgdesc="Manage your Toltec install" url=https://toltec-dev.org/ -pkgver=0.4.4-1 +pkgver=0.4.5-1 timestamp=2024-05-31T19:13Z section="utils" maintainer="Eeems " diff --git a/package/toltec-bootstrap/toltecctl b/package/toltec-bootstrap/toltecctl index 261e98392..5a26d3790 100644 --- a/package/toltec-bootstrap/toltecctl +++ b/package/toltec-bootstrap/toltecctl @@ -679,7 +679,7 @@ reenable() { generate-opkg-conf || true log INFO "Opkg update" opkg update - log INFO "Reinsalling base packages" + log INFO "Reinstalling base packages" reinstall-base log INFO "Reinstalling packages with files on the root partition" reinstall-root From c8a165292c5040523c25e4bf7565f773d1a89cdf Mon Sep 17 00:00:00 2001 From: raisjn <70462544+raisjn@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:19:29 -0700 Subject: [PATCH 12/17] [rmkit] remove rm2fb patchelf command (#898) * [rmkit] remove rm2fb patchelf command * [rmkit] bump package versions for a few apps * [rmkit] update all packages --------- Co-authored-by: okay --- package/rmkit/package | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package/rmkit/package b/package/rmkit/package index 6dea62b34..f1839892f 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -7,7 +7,7 @@ timestamp=2024-01-11T20:03:10Z maintainer="raisjn " license=MIT installdepends=(display) -flags=(patch_rm2fb) +flags=() image=python:v2.1 source=( @@ -31,7 +31,7 @@ build() { bufshot() { pkgdesc="program for saving the framebuffer as a png" url="https://github.com/rmkit-dev/rmkit/tree/master/src/bufshot" - pkgver=0.1.2-2 + pkgver=0.1.2-3 section="utils" package() { @@ -42,7 +42,7 @@ bufshot() { dumbskull() { pkgdesc="Dungeon Crawl themed Solitaire" url="https://rmkit.dev/apps/dumbskull" - pkgver=0.0.1-3 + pkgver=0.0.1-4 section="games" package() { @@ -54,7 +54,7 @@ dumbskull() { genie() { pkgdesc="Gesture engine that connects commands to gestures" url="https://rmkit.dev/apps/genie" - pkgver=0.1.7-1 + pkgver=0.1.7-2 section="utils" package() { @@ -80,7 +80,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.2.3-1 + pkgver=0.2.3-2 section="drawing" package() { @@ -97,7 +97,7 @@ harmony() { iago() { pkgdesc="overlay for drawing shapes via stroke injection" url="https://rmkit.dev/apps/iago" - pkgver=0.1.2-1 + pkgver=0.1.2-2 section="utils" installdepends+=("lamp") @@ -109,7 +109,7 @@ iago() { lamp() { pkgdesc="config based stroke injection utility" url="https://rmkit.dev/apps/lamp" - pkgver=0.1.1-2 + pkgver=0.1.1-3 section="utils" package() { @@ -120,7 +120,7 @@ lamp() { mines() { pkgdesc="Mine detection game" url="https://rmkit.dev/apps/minesweeper" - pkgver=0.1.4-3 + pkgver=0.1.4-4 section="games" package() { @@ -147,7 +147,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.3.0-5 + pkgver=0.3.0-6 section="launchers" installdepends=(procps-ng-ps) @@ -184,7 +184,7 @@ remux() { rpncalc() { pkgdesc="RPN Calculator" url="https://rmkit.dev/apps/rpncalc" - pkgver=0.0.3-3 + pkgver=0.0.3-4 section="math" package() { @@ -197,7 +197,7 @@ rpncalc() { simple() { pkgdesc="Simple app script for writing scripted applications" url="https://rmkit.dev/apps/sas" - pkgver=0.2.1-1 + pkgver=0.2.1-2 section="devel" package() { @@ -208,7 +208,7 @@ simple() { wordlet() { pkgdesc="Wordle clone" url="https://rmkit.dev/apps/wordlet" - pkgver=0.0.2-3 + pkgver=0.0.2-4 section="games" package() { From 29312140970b21233e3b8e737384d52fb1ecc48e Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 27 Jun 2024 07:55:47 -0600 Subject: [PATCH 13/17] Update oxide to v2.8.4 (#833) * Add sysfs_preload * Remove chroot for xochitl * Increment xochitl version * Make tarnish depend on sysfs_preload * Format fix * Update package * Update package * Update oxide to v2.8 * Update package * Update oxide to v2.8.1 * Resolve duplicate and missing conflicts from how-to-enable * Format fix * Properly ignore shutdown.target * Update to v2.8.2 * Add non-versioned symlink to librm2fb_client.so.1 * Update package * Update package * Update oxide to 2.8.4 --- package/display/package | 14 ++++++++------ package/oxide/package | 26 +++++++++++++++++--------- package/sysfs_preload/package | 28 ++++++++++++++++++++++++++++ package/xochitl/package | 2 +- package/xochitl/xochitl.oxide | 29 +---------------------------- 5 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 package/sysfs_preload/package diff --git a/package/display/package b/package/display/package index d14efd480..633b4e9f5 100644 --- a/package/display/package +++ b/package/display/package @@ -8,7 +8,7 @@ timestamp=2023-08-27T02:39:10Z maintainer="raisjn " license=MIT url="https://github.com/ddvk/remarkable2-framebuffer" -pkgver=1:0.0.33-2 +pkgver=1:0.0.33-3 _release="${pkgver%-*}" _release="v${_release#*:}" _libver=1.0.1 @@ -102,14 +102,16 @@ rm2fb-client() { replaces=(rm2fb) package() { - libname="librm2fb_client.so.$_libver" - install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libname" + libname="librm2fb_client.so" + libnamever="$libname.$_libver" + install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libnamever" install -d "$pkgdir"/usr/lib - ln -s /opt/lib/"$libname" "$pkgdir"/usr/lib/"$libname" + ln -s /opt/lib/"$libnamever" "$pkgdir"/usr/lib/"$libnamever" + ln -s /opt/lib/"$libnamever" "$pkgdir"/opt/lib/"$libname" for dest in opt/lib usr/lib; do - ln -s "$libname" "$pkgdir/$dest/${libname%.*.*}" - ln -s "$libname" "$pkgdir/$dest/${libname%.*}" + ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*.*}" + ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*}" done install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/rm2fb-client diff --git a/package/oxide/package b/package/oxide/package index 83e0c27ab..2dee131c3 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -1,12 +1,13 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT +archs=(rm1 rm2) pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry) -_oxidever=2.7 -pkgver=$_oxidever-7 -_sentryver=0.5.0 -timestamp=2023-12-05T04:43:04Z +_oxidever=2.8.4 +pkgver=$_oxidever-1 +_sentryver=0.7.6 +timestamp=2024-06-26T22:31:46Z maintainer="Eeems " url=https://oxide.eeems.codes license=MIT @@ -18,7 +19,7 @@ source=( launcherctl-oxide ) sha256sums=( - e1f20fc60ae8edccb941e09c0e61cbfb58f1f8a5f64be98870eb2d079f83316f + bfcb26c0493544fabc472bebc1eb372e49e58774163533ae937b6e814222f03e SKIP SKIP ) @@ -26,13 +27,15 @@ sha256sums=( build() { find . -name "*.pro" -type f -print0 \ | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' + find . -name "*.pri" -type f -print0 \ + | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' CMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" make FEATURES=sentry release } oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard" "jq") + installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display) replaces=(erode tarnish decay corrupt) conflicts=(erode tarnish decay corrupt) @@ -59,6 +62,10 @@ oxide() { install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide # launcherctl registration install -D -T -m 755 "$srcdir"/launcherctl-oxide "$pkgdir"/opt/share/launcherctl/oxide + if [[ $arch = rm2 ]]; then + install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \ + "$srcdir"/toltec-rm2-override.conf + fi } configure() { @@ -138,7 +145,8 @@ liboxide() { section="devel" package() { - install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/liboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libqsgepaper.so* } } @@ -148,7 +156,7 @@ liboxide-dev() { installdepends=("liboxide=$pkgver") package() { - install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/liboxide.pc + install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/oxide.pc install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/epframebuffer.h install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/liboxide.h cp -ar "$srcdir"/release/opt/include/liboxide/ "$pkgdir"/opt/include/ diff --git a/package/sysfs_preload/package b/package/sysfs_preload/package new file mode 100644 index 000000000..0fcd903d6 --- /dev/null +++ b/package/sysfs_preload/package @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(sysfs_preload) +pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead." +url="https://github.com/Eeems-Org/sysfs_preload" +pkgver=1.0.1-1 +timestamp=2024-06-22T05:19Z +section=util +maintainer="Eeems " +license=MIT + +image=qt:v3.1 +source=(https://github.com/Eeems-Org/sysfs_preload/archive/refs/tags/1.0.1.tar.gz) +sha256sums=(73627b68e3b2454efcc2d83e6ebdc2eb473f9cc2616ed1b9dd2acae159c54b3d) + +build() { + find . -name "*.pro" -type f -print0 \ + | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' + qmake + make -j"$(nproc)" + INSTALL_ROOT="dist" make install +} + +package() { + cp -ar "${srcdir}/dist/." "${pkgdir}" +} diff --git a/package/xochitl/package b/package/xochitl/package index c8fb1d132..ba890d642 100644 --- a/package/xochitl/package +++ b/package/xochitl/package @@ -5,7 +5,7 @@ pkgnames=(xochitl) pkgdesc="Read documents and take notes" url=https://remarkable.com -pkgver=0.0.0-20 +pkgver=0.0.0-21 timestamp=2022-11-07T20:19:57Z section="readers" maintainer="Mattéo Delabre " diff --git a/package/xochitl/xochitl.oxide b/package/xochitl/xochitl.oxide index c4673ad2f..1ebe793b9 100644 --- a/package/xochitl/xochitl.oxide +++ b/package/xochitl/xochitl.oxide @@ -3,32 +3,5 @@ "description": "Read documents and take notes", "bin": "/opt/bin/xochitl", "icon": "/opt/etc/draft/icons/xochitl.png", - "flags": ["nosplash", "chroot"], - "permissions": ["power"], - "directories": [ - "/dev/shm", - "/etc", - "/home/root", - "/opt/etc", - "/run/dbus", - "/run/lock", - "/run/systemd", - "/run/systemd/resolve", - "/run/udev", - "/tmp/runtime-root", - "/usr/share", - "/usr/share/remarkable/templates", - "/usr/local/share/ca-certificates", - "/var/cache/fontconfig", - "/var/lib/dbus", - "/var/volatile/tmp" - ], - "environment": { - "HOME": "/home/root", - "QMLSCENE_DEVICE": "epaper", - "QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS": "rotate=180", - "QT_QPA_PLATFORM": "epaper", - "SYSTEMD_IGNORE_CHROOT": "true", - "XDG_RUNTIME_DIR": "/tmp/runtime-root" - } + "flags": ["nosplash"] } From 919bf5ea6a51143b445cb98f3b97180e1ba345da Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 27 Jun 2024 08:26:25 -0600 Subject: [PATCH 14/17] Workaround #886 (#887) --- package/toltec-deletions/package | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index 8db7bcb33..87ede6ffc 100644 --- a/package/toltec-deletions/package +++ b/package/toltec-deletions/package @@ -2,18 +2,20 @@ # Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT -archs=(rmallos2 rm1os3 rm2os3) +archs=(rm1os2 rm1os3 rm2os2 rm2os3) pkgnames=(toltec-deletions) pkgdesc="Metapackage to handle package deletions between OS versions" url=https://toltec-dev.org/ -pkgver=0.1-6 +pkgver=0.1-7 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " license=MIT installdepends=(toltec-bootstrap) -conflicts_rmallos2=() -replaces_rmallos2=() +conflicts_rm1os2=() +replaces_rm1os2=() +conflicts_rm2os2=() +replaces_rm2os2=() conflicts_rm1os3=( ddvk-hacks fuse From c46168bee9c8155871467ca08bffa0a6f6aed10b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 30 Jun 2024 19:30:50 -0600 Subject: [PATCH 15/17] Update libsentry timestamp and depend on launcherctl (#903) --- package/oxide/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index 2dee131c3..9ce51549b 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -5,7 +5,7 @@ archs=(rm1 rm2) pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry) _oxidever=2.8.4 -pkgver=$_oxidever-1 +pkgver=$_oxidever-2 _sentryver=0.7.6 timestamp=2024-06-26T22:31:46Z maintainer="Eeems " @@ -35,7 +35,7 @@ build() { oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display) + installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display launcherctl) replaces=(erode tarnish decay corrupt) conflicts=(erode tarnish decay corrupt) @@ -168,7 +168,7 @@ libsentry() { section="devel" url=https://github.com/getsentry/sentry-native pkgver="$_sentryver" - timestamp="2021-12-20T14:25:11Z" + timestamp="2024-06-12T08:04:15Z" package() { install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so From bffc3f9fc7a4849e8c043d0d23e1743a584fe5d3 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 6 Sep 2024 11:54:51 -0600 Subject: [PATCH 16/17] Update toltecmk and black (#909) --- package/signature-rm/package | 2 +- package/toltec-base/package | 2 +- package/toltec-deletions/package | 2 +- requirements.txt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/signature-rm/package b/package/signature-rm/package index 87154993a..d826d244c 100644 --- a/package/signature-rm/package +++ b/package/signature-rm/package @@ -6,7 +6,7 @@ archs=(rmallos2 rmallos3) pkgnames=("signature-rm") pkgdesc="Remove the signature from the bottom of emails" url="https://github.com/rM-self-serve/signature-rM" -pkgver=1.0.2-2 +pkgver=1.0.2-3 timestamp=2023-12-06T11:43:00Z section="utils" maintainer="rM-self-serve <122753594+rM-self-serve@users.noreply.github.com>" diff --git a/package/toltec-base/package b/package/toltec-base/package index e4b0a4539..6e3d8be49 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,7 +6,7 @@ archs=(rmall rmallos2 rmallos3 rm1 rm1os2 rm1os3 rm2 rm2os2 rm2os3) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.4-1 +pkgver=1.4-2 timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index 87ede6ffc..b5c383713 100644 --- a/package/toltec-deletions/package +++ b/package/toltec-deletions/package @@ -6,7 +6,7 @@ archs=(rm1os2 rm1os3 rm2os2 rm2os3) pkgnames=(toltec-deletions) pkgdesc="Metapackage to handle package deletions between OS versions" url=https://toltec-dev.org/ -pkgver=0.1-7 +pkgver=0.1-8 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " diff --git a/requirements.txt b/requirements.txt index 3db01c1dd..7aadcde47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -black==23.7.0 +black==24.8.0 certifi==2023.7.22 idna==3.4 isort==5.12.0 @@ -8,7 +8,7 @@ mypy-extensions==1.0.0 mypy==1.7.1 pylint==3.0.3 six==1.16.0 -toltecmk==0.3.2 +toltecmk==0.3.3 toml==0.10.2 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 From f8430da5833b3184ffda7175610ac8ae2274d022 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Sun, 8 Sep 2024 19:24:07 +0200 Subject: [PATCH 17/17] Kernelctl os version (#905) * Change os version scheme --------- Co-authored-by: Nathaniel van Diepen --- package/kernelctl/kernelctl | 9 ++++++--- package/kernelctl/package | 10 ++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/kernelctl/kernelctl b/package/kernelctl/kernelctl index ae24716d1..5ad691d85 100644 --- a/package/kernelctl/kernelctl +++ b/package/kernelctl/kernelctl @@ -14,6 +14,9 @@ bl="\033[1;34m" # blue # change our working directory to / to ease filesystem operations cd / +# find current os version +os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf) + help() { read -r -d '' msg <<- EOM Usage: $(basename "$0") COMMAND @@ -36,7 +39,7 @@ help() { # backup current kernel backup() { if [[ "$1" = "vanilla" ]]; then - kernel_name="vanilla-$(< /etc/version)" + kernel_name="vanilla-$os_version" else kernel_name=$1 fi @@ -82,7 +85,7 @@ to_kernel_name() { echo "${kernel_names[$(($1 - 1))]}" return elif [[ "$1" = "default" ]]; then - ker="vanilla-$(< /etc/version)" + ker="vanilla-$os_version" else ker="$1" fi @@ -185,7 +188,7 @@ prune() { 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) + mapfile -t filenames < <(find "$kernelctl_dir" -path "*vanilla-*.tar.bz2" ! -name vanilla-"$os_version".tar.bz2) for filename in "${filenames[@]}"; do rm "$filename" done diff --git a/package/kernelctl/package b/package/kernelctl/package index dcfcd5f7d..31acac595 100644 --- a/package/kernelctl/package +++ b/package/kernelctl/package @@ -5,7 +5,7 @@ pkgnames=(kernelctl) pkgdesc="Manage aftermarket kernels" url=https://toltec-dev.org/ -pkgver=0.1-7 +pkgver=0.2-1 timestamp=2022-11-12T00:00Z section="utils" maintainer="Salvatore Stella " @@ -26,15 +26,17 @@ package() { } configure() { - if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then + os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf) + if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$os_version")" == "" ]]; then echo "Creating a backup of the currently running kernel." 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 + os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf) + if [[ "$(kernelctl show | tail -n 1 | grep "vanilla-$os_version")" == "" ]]; then + if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$os_version")" == "" ]]; then echo "Unable to restore default kernel." echo "To force removal, you can run the following:" echo " opkg remove --force-remove kernelctl"