From f8430da5833b3184ffda7175610ac8ae2274d022 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Sun, 8 Sep 2024 19:24:07 +0200 Subject: [PATCH 01/19] 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" From 15ef15386f03d0d539efee185a4e96d6122434c9 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Thu, 12 Sep 2024 19:54:33 +0200 Subject: [PATCH 02/19] Update whiteboard-hypercard to 0.5.0 (#917) * Update whiteboard-hypercard to 0.4.0 * Update whiteboard-hypercard to 0.5.0 Signed-off-by: Pierre Fenoll --------- Signed-off-by: Pierre Fenoll Co-authored-by: Nathaniel van Diepen --- package/whiteboard-hypercard/package | 16 ++++++++-------- .../whiteboard-hypercard.draft | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 581882d83..9cb9a468b 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -1,25 +1,25 @@ #!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(whiteboard-hypercard) pkgdesc="Real-time collaboration, drawing or whiteboarding" url=https://github.com/fenollp/reMarkable-tools -pkgver=0.3.7-2 -timestamp=2023-10-11T12:57Z +pkgver=0.5.0-1 +timestamp=2024-09-12T19:00:22Z section="drawing" maintainer="Pierre Fenoll " license=CC-BY-NC-ND installdepends=(display) flags=(patch_rm2fb) -image=rust:v3.1 +image=rust:v3.2 source=( - https://github.com/fenollp/reMarkable-tools/archive/v0.3.7.zip + https://github.com/fenollp/reMarkable-tools/archive/refs/tags/v0.5.0.zip whiteboard-hypercard.draft ) sha256sums=( - 642fd954ec4f9a1d132b10cc7f7dfbee3467e9c08b1253cc32d1e372178d168b + 668f0b1dbc6027f6f6b8ab69f65c844a718f38115f79b9ce79e060a1cef3edfb SKIP ) @@ -27,11 +27,11 @@ build() { pushd marauder rustup component add rustfmt cargo fetch - cargo build --release --bin whiteboard --locked --frozen --offline + cargo build --release --package=marauder --bin=whiteboard --locked --frozen --offline --target=armv7-unknown-linux-gnueabihf popd } package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/marauder/target/armv7-unknown-linux-gnueabihf/release/whiteboard + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/whiteboard install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/whiteboard-hypercard.draft } diff --git a/package/whiteboard-hypercard/whiteboard-hypercard.draft b/package/whiteboard-hypercard/whiteboard-hypercard.draft index c1565788e..11c499816 100644 --- a/package/whiteboard-hypercard/whiteboard-hypercard.draft +++ b/package/whiteboard-hypercard/whiteboard-hypercard.draft @@ -1,4 +1,4 @@ -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT name=whiteboard From 0d48822b5ecce22529bdf037ad5a4a3b833a84b5 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 13 Sep 2024 18:54:28 -0600 Subject: [PATCH 03/19] Bump toltec-deletions version as master is out of sync (#919) --- package/toltec-deletions/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index b5c383713..4d78a343c 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-8 +pkgver=0.1-9 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " From 5ba126848fe44a0a7434c44f9436c18bae92dae8 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 13 Sep 2024 19:44:12 -0600 Subject: [PATCH 04/19] Fix builds (#921) * Fix linux build again * Update package --- package/linux-mainline/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 754fa6591..1db253d36 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/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=6.3.0-1 +pkgver=6.3.0-2 timestamp=2023-08-23T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -15,7 +15,7 @@ installdepends=(kernelctl) license=GPL-2.0-only flags=(nostrip) -image=base:v2.3 +image=base:v3.2 source=( https://github.com/alistair23/linux/archive/1698a3bdd8d66e58873c5bb3ce370b7d48b004cf.tar.gz remarkable_defconfig From 66b6017a4a7f7d41dd6fc0bac755e4079dabf58b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:17:25 -0600 Subject: [PATCH 05/19] Fix sysfs_preload category (#923) --- package/sysfs_preload/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysfs_preload/package b/package/sysfs_preload/package index 0fcd903d6..73deb2392 100644 --- a/package/sysfs_preload/package +++ b/package/sysfs_preload/package @@ -5,9 +5,9 @@ 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 +pkgver=1.0.1-2 timestamp=2024-06-22T05:19Z -section=util +section=utils maintainer="Eeems " license=MIT From 448b2cb8120103cc77616627118cab3b92235c11 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:21:21 -0600 Subject: [PATCH 06/19] Fix launcherctl category (#922) --- package/launcherctl/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/launcherctl/package b/package/launcherctl/package index 7a7743845..3b217bf3e 100644 --- a/package/launcherctl/package +++ b/package/launcherctl/package @@ -5,9 +5,9 @@ pkgnames=(launcherctl) pkgdesc="Manage your installed launcher" url=https://toltec-dev.org/ -pkgver=0.0.1-2 +pkgver=0.0.1-3 timestamp=2023-12-18T03:32Z -section="launcher" +section="launchers" maintainer="Eeems " license=MIT From 20721b0fd19d45ce9cf39048e099c0fb515ed3a8 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:25:22 -0600 Subject: [PATCH 07/19] Add writing section as we have apps in it already (#924) --- docs/package.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/package.md b/docs/package.md index bdaf7807a..072da60b5 100644 --- a/docs/package.md +++ b/docs/package.md @@ -336,6 +336,7 @@ screensharing | Apps for streaming the display between the PC and tablet. templates | Templates for xochitl notebooks. splashscreens | Splashscreens for device startup, poweroff, suspend, etc. utils | System tools and various apps. +writing | Apps for writing text. If the package does not fit into one of the existing sections, you are free to create a new one and document it here. From a8fac37a06f5e9574ddf72d7de3bccdb768493bc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:28:40 -0600 Subject: [PATCH 08/19] Fix mmc-utils build (#878) * Update package * Update package --- package/mmc-utils/package | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/package/mmc-utils/package b/package/mmc-utils/package index a91ae561b..948dffa99 100644 --- a/package/mmc-utils/package +++ b/package/mmc-utils/package @@ -6,7 +6,7 @@ archs=(rmall) pkgnames=(mmc-utils) pkgdesc="A tool for monitoring the eMMC protocol" url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/ -pkgver=1.0-0 +pkgver=1.0-1 timestamp=2021-08-12T19:41:07Z section="devel" maintainer="Alistair Francis " @@ -14,13 +14,22 @@ license=GPL-2.0-only image=base:v2.2 source=( - "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-7769a4d7abe339ce273c13a203394a79a11fcff9.tar.gz" 0001-Makefile-Remove-Werror.patch ) sha256sums=( - 0578e546d8893b6207180def7966e7314cae54c237a931b8f94779ce5c7d0668 SKIP ) +_commit=7769a4d7abe339ce273c13a203394a79a11fcff9 + +prepare() { + cd "$srcdir" + mkdir mmc-utils + cd mmc-utils + git init + git fetch --depth=1 "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git" "$_commit" + git checkout -f "$_commit" + patch < "$srcdir"/0001-Makefile-Remove-Werror.patch +} build() { # Use our toolchain @@ -28,10 +37,9 @@ build() { export CC=arm-linux-gnueabihf-gcc export STRIP=arm-linux-gnueabihf-strip - patch < "$srcdir"/0001-Makefile-Remove-Werror.patch - make -j4 + make -C "$srcdir"/mmc-utils -j4 } package() { - DESTDIR="$pkgdir" make -C "$srcdir" install + DESTDIR="$pkgdir" make -C "$srcdir"/mmc-utils install } From dda27e26af423b6aa4e0168ab176900c509b89f5 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:40:57 -0600 Subject: [PATCH 09/19] Update innernet-client to 1.6.1 (#868) * Update innernet-client to 1.6.1 * Remove inn symlink * Use latest rust and bump copyright --- package/innernet/package | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/package/innernet/package b/package/innernet/package index db2510734..2c9445e88 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -1,26 +1,26 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT archs=(rmallos2) pkgnames=(innernet-client) pkgdesc="A private network system that uses WireGuard under the hood." url="https://github.com/tonarino/innernet" -pkgver=1.5.3-3 -timestamp=2022-01-31T20:08:43Z +pkgver=1.6.1-1 +timestamp=2024-01-19T14:24:40Z section="utils" maintainer="plan5 <30434574+plan5@users.noreply.github.com>" license=MIT installdepends=(wireguard) makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang) -image=rust:v2.2.2 +image=rust:v3.1 _srcver="v${pkgver%-*}" source=( "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip" ) sha256sums=( - 2f7ca1d802d898b1c4fd090cba9e0562a1e80d617b55f23ba596e81c99441a1c + fd9ec6eb75dcc46c818696e7fcb87eb772dc024e0c326360f0f8c473c937c37c ) prepare() { @@ -43,9 +43,6 @@ package() { install -D -m 700 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/innernet install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet@.service" install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet.target" - - # Link /opt/bin/innernet to /opt/bin/inn - ln -s /opt/bin/innernet "$pkgdir"/opt/bin/inn } configure() { From 31a0bbd3584bba9174c67aa4dac396c753a9b188 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:47:27 -0600 Subject: [PATCH 10/19] Update yaft and tilem to 0.1.2 (#913) * Update yaft to 0.1.2 * Update tilem to 0.1.2 --- package/tilem/package | 23 ++++++++++++++--------- package/yaft/package | 23 ++++++++++++++--------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/package/tilem/package b/package/tilem/package index 17be922d7..adca938fe 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -5,14 +5,15 @@ pkgnames=(tilem) pkgdesc="TI-84+ calculator emulator" url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem -_tag=0.1.1 +_tag=0.1.2 pkgver=${_tag}-1 -timestamp=2023-11-25T20:49:48Z +timestamp=2024-05-29T17:05:56Z maintainer="Mattéo Delabre " license=GPL-3.0 section="utils" image=base:v3.1 installdepends=(display) +flags=(nostrip) source=() sha256sums=() @@ -31,14 +32,18 @@ prepare() { } build() { - mkdir build + cd "$srcdir" mkdir install - cd build - cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../tilem - cd apps/tilem - make - make install + cd tilem + cmake --preset release-toltec + cmake \ + --build build/release-toltec \ + --target tilem + cmake \ + --install build/release-toltec \ + --prefix ../install \ + --component tilem \ + --strip } package() { diff --git a/package/yaft/package b/package/yaft/package index 251dc0f77..5a635896a 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,14 +5,15 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -_tag=0.1.1 +_tag=0.1.2 pkgver=${_tag}-1 -timestamp=2023-11-25T20:49:48Z +timestamp=2024-05-29T17:05:56Z maintainer="Mattéo Delabre " license=GPL-3.0 section="admin" image=base:v3.1 installdepends=(display terminfo) +flags=(nostrip) source=() sha256sums=() @@ -31,14 +32,18 @@ prepare() { } build() { - mkdir build + cd "$srcdir" mkdir install - cd build - cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../yaft - cd apps/yaft - make - make install + cd yaft + cmake --preset release-toltec + cmake \ + --build build/release-toltec \ + --target yaft + cmake \ + --install build/release-toltec \ + --prefix ../install \ + --component yaft \ + --strip } package() { From f1d0c8ac96ee53e06774707ecd9c1dcf29426f17 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:58:59 -0600 Subject: [PATCH 11/19] Update zerotier-one to 1.14.1 (#918) --- package/zerotier-one/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zerotier-one/package b/package/zerotier-one/package index 2baabf2ef..5e4827fb4 100644 --- a/package/zerotier-one/package +++ b/package/zerotier-one/package @@ -4,7 +4,7 @@ pkgnames=(zerotier zerotier-one zerotier-one-doc zerotier-selftest) url=https://github.com/zerotier/ZeroTierOne -_upver=1.12.2 +_upver=1.14.1 pkgver=${_upver}-1 timestamp=2023-03-23T17:39:31Z maintainer="Eeems " @@ -13,7 +13,7 @@ section="utils" image=base:v3.0 source=("https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${_upver}.zip") -sha256sums=(2089fc824c84985610f0bd60186c72e94e2592d8f38259a1c80ea8f696edd16b) +sha256sums=(fcf30ce797dbca757f3e882e004a3f953ebe12ae13f03d804b3fb184ee3c9714) build() { sed -i \ From db95a405ec39d760a8b46a65929a7736539c1eb6 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 12:05:20 -0600 Subject: [PATCH 12/19] Update micro to 2.0.14 (#914) * Update micro to 2.0.14 --- package/micro/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/micro/package b/package/micro/package index 61cc10432..e1651a49a 100644 --- a/package/micro/package +++ b/package/micro/package @@ -5,14 +5,14 @@ pkgnames=(micro) pkgdesc="Modern and intuitive terminal-based text editor" url=https://micro-editor.github.io/ -pkgver=2.0.13-2 -timestamp=2023-10-21T22:38:29Z +pkgver=2.0.14-1 +timestamp=2024-08-27T18:13:07Z section="utils" maintainer="Eeems " license=MIT -source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz") -sha256sums=(adb9cf644354a5c85819db40e1a427f0f4951b172597bbcd3ef94ecc4a8c4b75) +source=("https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-linux-arm.tar.gz") +sha256sums=(9f490d88bd30a548af99a905f50244dc6c80f3c7a3c6f98faeb5b0a7329f7dea) package() { install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE" From f63a800d084947c314ae1194a1df373d8d7015c3 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 12:08:26 -0600 Subject: [PATCH 13/19] Update quickjs to 2024.01.13 (#851) * Update quickjs to 2024.01.13 * Remove patch from package * Delete package/quickjs/quickjs.patch * Fix quickjs compile * Add qjscalc symlink * Fix lint error --- package/quickjs/package | 19 ++++++++----------- package/quickjs/quickjs.patch | 13 ------------- 2 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 package/quickjs/quickjs.patch diff --git a/package/quickjs/package b/package/quickjs/package index 78467226b..ef41e2092 100644 --- a/package/quickjs/package +++ b/package/quickjs/package @@ -5,29 +5,26 @@ pkgnames=(quickjs) pkgdesc="A small and embeddable Javascript engine" url=https://bellard.org/quickjs/ -pkgver=2020.11.08-2 +pkgver=2024.01.13-1 section="devel" -timestamp=2020-11-08T13:44Z +timestamp=2024-01-13T00:00Z maintainer="khanhas " license=MIT -image=base:v2.1 +image=base:v3.1 source=( - https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz - quickjs.patch + https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz ) sha256sums=( - 2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b - SKIP + 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 ) build() { - patch -u Makefile -i quickjs.patch - make qjs.arm + make CROSS_PREFIX="$CROSS_COMPILE" qjs qjscalc } package() { install -d "$pkgdir"/opt/bin - install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs.arm - mv "$pkgdir"/opt/bin/qjs.arm "$pkgdir"/opt/bin/qjs + install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs + ln -s qjs "$pkgdir"/opt/bin/qjscalc } diff --git a/package/quickjs/quickjs.patch b/package/quickjs/quickjs.patch deleted file mode 100644 index 250c666b5..000000000 --- a/package/quickjs/quickjs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile 2020-11-08 23:21:09.000000000 +1000 -+++ Makefile.new 2021-02-10 14:36:08.954392400 +1000 -@@ -60,8 +60,8 @@ - endif - EXE=.exe - else -- CROSS_PREFIX= -- EXE= -+ CROSS_PREFIX=$(CROSS_COMPILE) -+ EXE=.arm - endif - ifdef CONFIG_CLANG - HOST_CC=clang From 6e08705b8d848f593e77805fad5637edf432dbcc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 12:18:44 -0600 Subject: [PATCH 14/19] Update koreader to 2024.07 (#916) --- package/koreader/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index 182d6d237..99099b8db 100644 --- a/package/koreader/package +++ b/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=2024.04-5 -timestamp=2024-04-29T19:56:05Z +pkgver=2024.07-1 +timestamp=2024-07-15T16:21:26Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -22,7 +22,7 @@ source=( launcherctl-koreader ) sha256sums=( - e6b3a5a2c8cde8ca0c469fe542d6e170502fcf39b9a55e4447a7acd02b4a12c0 + 1040894434421b52076473f7947f139e2c98fcc04b1acadfe29b3362f262f9b7 SKIP SKIP SKIP From 02cafa5c86e711af03524f3dd77880fe1b26235f Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 16 Sep 2024 14:25:27 -0600 Subject: [PATCH 15/19] Update github actions to latest (#895) --- .github/actions/setup/action.yml | 10 +++++----- .github/workflows/pr.yml | 6 +++--- .github/workflows/stable.yml | 2 +- .github/workflows/testing.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index dfb09584b..3e34d796a 100644 --- a/.github/actions/setup/action.yml +++ b/.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@v3 + uses: actions/cache@v4 id: cache-apt with: path: ~/.aptcache @@ -26,7 +26,7 @@ runs: sudo cp --verbose --force --recursive ~/.aptcache/* / fi - name: Cache shfmt - uses: actions/cache@v3 + uses: actions/cache@v4 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@v3 + uses: actions/cache@v4 with: path: /usr/local/bin/shellcheck key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8 @@ -68,11 +68,11 @@ runs: sudo mv shellcheck "$install_dir" fi - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.12' - name: Cache Python environment - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-python with: path: .venv diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a0dbca99c..c6b30ff9b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Toltec dependencies uses: ./.github/actions/setup - name: Check formatting @@ -20,13 +20,13 @@ jobs: needs: lint steps: - name: Checkout the Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Toltec dependencies uses: ./.github/actions/setup - name: Build packages run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new - name: Save the build output - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: repo path: build/repo diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index caa8c28c8..2ad14c7bf 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Toltec dependencies uses: ./.github/actions/setup - name: Build packages diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ed52c0ecf..24446c870 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Toltec dependencies uses: ./.github/actions/setup - name: Build packages From 3d5df4a13fa32fc3fb32b89ae7c98751b4a25010 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 12 Oct 2024 09:55:09 -0600 Subject: [PATCH 16/19] update wireguard to 1.0.20220627 (#651) * update wireguard to 1.0.20220627 and wireguard-tools to 1.0.20210914 * Update package * Update to use base:v3.1 * Update image to v3.2 --- package/wireguard/package | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/wireguard/package b/package/wireguard/package index 9a46b62c6..80c511938 100755 --- a/package/wireguard/package +++ b/package/wireguard/package @@ -5,32 +5,32 @@ archs=(rm1os2 rm2os2) pkgnames=(wireguard) pkgdesc="Fast, modern, secure VPN tunnel" url=https://www.wireguard.com -pkgver=1.0.20210219-5 +pkgver=1.0.20220627-1 timestamp=2021-02-19T14:08Z section=kernel maintainer="Jonah Weissman " license=GPL-2.0-only -makedepends=(build:bc build:lzop build:git) +makedepends=(build:bc build:lzop build:git build:flex build:bison build:libssl-dev) flags=(nostrip) installdepends=(wireguard-tools) _kernelrepo=https://github.com/remarkable/linux _kernelrevs=( - 1774e2a6a091fdc081324e966d3db0aa9df75c0b - d4e7e07a390f8b2544ca09d69142d18114149004 + bb6be69d6f71fced2fc63c61372bf96e5f7da565 + bb6be69d6f71fced2fc63c61372bf96e5f7da565 ) _defconfigs=( arch/arm/configs/zero-gravitas_defconfig arch/arm/configs/zero-sugar_defconfig ) -image=base:v2.1 +image=base:v3.2 source=( "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver%-*}.tar.xz" fix-multiple-yylloc-definitions.patch ) sha256sums=( - 99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00 + 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 SKIP ) From 3d9fb767a47e0885e800a89c30b48aa6713aa44a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 12 Oct 2024 10:08:51 -0600 Subject: [PATCH 17/19] Disable innernet systemd units on uninstall (#884) * Fix #779 * Update to rust:v3.1 * Update innernet to v1.6.1 --- package/innernet/package | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/innernet/package b/package/innernet/package index 2c9445e88..b34064f7a 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -50,3 +50,12 @@ configure() { mkdir -p /opt/var/lib/innernet fi } + +preremove() { + disable-unit innernet.target + disable-unit innernet@.service +} + +postremove() { + systemctl daemon-reload +} From c49608827a26460a294831c92ffe41b26e1efd75 Mon Sep 17 00:00:00 2001 From: Kai Date: Tue, 17 Dec 2024 12:10:41 -0500 Subject: [PATCH 18/19] Add package for keyd (#744) * Add keyd --------- Co-authored-by: Nathaniel van Diepen --- package/keyd/default.conf | 4 +++ package/keyd/package | 59 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 package/keyd/default.conf create mode 100644 package/keyd/package diff --git a/package/keyd/default.conf b/package/keyd/default.conf new file mode 100644 index 000000000..8547f3aee --- /dev/null +++ b/package/keyd/default.conf @@ -0,0 +1,4 @@ +[ids] +# 2edd:0001 # type folio + +[main] diff --git a/package/keyd/package b/package/keyd/package new file mode 100644 index 000000000..ce9523a42 --- /dev/null +++ b/package/keyd/package @@ -0,0 +1,59 @@ +#!/usr/bin/env bash +# Copyright (c) 2020 The Toltec Contributors +# SPDX-License-Identifier: MIT + +archs=(rmallos3) +pkgnames=(keyd) +pkgdesc="A key remapping daemon for linux" +url="https://github.com/rvaiya/keyd" +pkgver=2.4.3-1 +timestamp=2023-05-16T10:11Z +section=utils +maintainer="Kai " +license=MIT + +image=base:v3.1 +source=( + https://github.com/rvaiya/keyd/archive/refs/tags/v2.4.3.zip + default.conf +) +sha256sums=( + cdfcc2cf0518b9a2d292ebac17b18f78548b92803e2a9deeb9f18c9641bf80e5 + SKIP +) + +build() { + make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd "CC=${CROSS_COMPILE}cc" + sed -i 's|ExecStart=/usr/bin/keyd|ExecStart=/opt/bin/keyd|' keyd.service +} + +package() { + cd "$srcdir" + make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd DESTDIR="$pkgdir" install + rmdir "$pkgdir"/etc/keyd + install -D -m 644 -t "$pkgdir"/etc/systemd/system "$srcdir"/keyd.service + install -D -m 644 -t "$pkgdir"/opt/etc/keyd "$srcdir"/default.conf +} + +configure() { + addgroup keyd + systemctl daemon-reload + if is-active keyd; then + systemctl restart keyd + elif ! is-enabled "$pkgname.service"; then + echo "" + echo "Run the following command(s) to enable the keyd service" + how-to-enable "$pkgname.service" + echo "" + echo "You will need to modify /opt/etc/keyd/default.conf before starting the service" + fi +} + +preremove() { + disable-unit keyd + delgroup keyd +} + +postremove() { + systemctl daemon-reload +} From 66c02ec34b6b0e19bacac400ef590426c8061149 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Tue, 17 Dec 2024 14:52:22 -0700 Subject: [PATCH 19/19] Add debootstrap and debian-chroot packages (#799) * Add debian-chroot and debootstrap --- package/debian-chroot/debian-chroot.conf | 1 + package/debian-chroot/package | 80 ++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 package/debian-chroot/debian-chroot.conf create mode 100644 package/debian-chroot/package diff --git a/package/debian-chroot/debian-chroot.conf b/package/debian-chroot/debian-chroot.conf new file mode 100644 index 000000000..1910a84a4 --- /dev/null +++ b/package/debian-chroot/debian-chroot.conf @@ -0,0 +1 @@ +chroot_path="/home/root/.local/share/debian" diff --git a/package/debian-chroot/package b/package/debian-chroot/package new file mode 100644 index 000000000..41f422ace --- /dev/null +++ b/package/debian-chroot/package @@ -0,0 +1,80 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(debian-chroot debootstrap) +section="utils" +# Each package has it's own timestamp override below +timestamp=2023-12-22T19:37Z +maintainer="Eeems " +installdepends=(display) +flags=(nostrip) + +source=( + https://github.com/Eeems-org/remarkable-debian-chroot/archive/ea12a1bf851f412e8df4b59fe072bce26bb72571.zip + https://salsa.debian.org/installer-team/debootstrap/-/archive/1.0.133/debootstrap-1.0.133.tar.gz + debian-chroot.conf +) +sha256sums=( + 3fcd571ba1aa1a5c55a32767c34e6939e0c0e8ad9213425c6d66d25300fe24b8 + 734af3492eea99de940853e2c00e1a9ebd65c463362155f613aa24b9cc3336a0 + SKIP +) + +debian-chroot() { + pkgdesc="A minimal Debian chroot for the reMarkable tablet" + url=https://github.com/Eeems-Org/remarkable-debian-chroot + pkgver=0.0.0-1 + timestamp=2023-12-22T19:37Z + license=MIT + installdepends=(debootstrap lsof) + package() { + install -D -m 755 \ + "$srcdir"/bin/debian-chroot \ + "$pkgdir"/opt/bin/debian-chroot + install -D -m 655 \ + "$srcdir"/debian-chroot.conf \ + "$pkgdir"/home/root/.config/debian-chroot.conf + mkdir -p "$pkgdir"/opt/etc/ + ln -s /home/root/.config/debian-chroot.conf \ + "$pkgdir"/opt/etc/debian-chroot.conf + source "$srcdir"/debian-chroot.conf + mkdir -p "$pkgdir"/opt/lib/ + ln -s "$chroot_path" "$pkgdir"/opt/lib/debian-chroot + } + configure() { + # Force debian chroot to install iteself + debian-chroot true + } + preremove() { + source /home/root/.config/debian-chroot.conf + if lsof "$chroot_path" 2> /dev/null | grep "$chroot_path"; then + echo "Error: debian-chroot has running processes" + exit 1 + fi + if grep -q "$chroot_path " /proc/mounts; then + /bin/umount -R "$chroot_path" + fi + cp /home/root/.config/debian-chroot.conf /tmp/_debian-chroot.conf + } + postremove() { + source /tmp/_debian-chroot.conf + rm -rf "$chroot_path" + rm /tmp/_debian-chroot.conf + } +} + +debootstrap() { + pkgdesc="debootstrap is a tool which will install a Debian base system into a subdirectory of another, already installed system." + installdepends=(perl ar) + url=https://wiki.debian.org/Debootstrap + pkgver=1.0.133-1 + timestamp=2023-10-21T11:38Z + license=MIT + package() { + cd "$srcdir" + sed -i 's|/usr/sbin|/sbin|' Makefile + make DESTDIR="$pkgdir"/opt install + sed -i 's|DEBOOTSTRAP_DIR=/usr/share/debootstrap|DEBOOTSTRAP_DIR=/opt/usr/share/debootstrap|' "$pkgdir"/opt/sbin/debootstrap + } +}