-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stable merge for week 37 of 2024 (#920)
### Updated Packages - `kernelctl` - 0.2-1 (#905) - `whiteboard-hypercard` - 0.5.0-1 (#917) - `linux-mainline` - 6.3.0-1 (#732) - Now available on OS 3.x - `toltec-deletions` - 6.3.0-1 (#732 #919)
- Loading branch information
Showing
6 changed files
with
32 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]>" | ||
|
@@ -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" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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-2 | ||
timestamp=2023-08-23T21:50:09Z | ||
section=kernel | ||
maintainer="Alistair Francis <[email protected]>" | ||
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 | ||
image=base:v3.2 | ||
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" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]>" | ||
|
@@ -22,7 +22,6 @@ conflicts_rm1os3=( | |
wireguard | ||
innernet-client | ||
gocryptfs | ||
linux-mainline | ||
remarkable-stylus | ||
) | ||
replaces_rm1os3=( | ||
|
@@ -31,7 +30,6 @@ replaces_rm1os3=( | |
wireguard | ||
innernet-client | ||
gocryptfs | ||
linux-mainline | ||
remarkable-stylus | ||
) | ||
conflicts_rm2os3=( | ||
|
@@ -40,7 +38,6 @@ conflicts_rm2os3=( | |
wireguard | ||
innernet-client | ||
gocryptfs | ||
linux-mainline | ||
remarkable-stylus | ||
open-remarkable-shutdown | ||
) | ||
|
@@ -50,7 +47,6 @@ replaces_rm2os3=( | |
wireguard | ||
innernet-client | ||
gocryptfs | ||
linux-mainline | ||
remarkable-stylus | ||
open-remarkable-shutdown | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,37 @@ | ||
#!/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 <[email protected]>" | ||
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 | ||
) | ||
|
||
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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters