-
Notifications
You must be signed in to change notification settings - Fork 60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix remarkable-shutdown calls and add toltec-base package #532
Conversation
I can confirm I see the same issue on rM1, version 2.11.0.442. However remarkable-shutdown is working fine on rM2 (same version), so I would say that this is likely just an oversight from rM. I’m a bit hesitant to include such a fix in Toltec. Perhaps a better route would be to notify the rM devs of this and get this fixed? |
Next time we see them on we can try to let them know I guess. That said, it's broken right now, so we might as well fix it for our users in a way that works across OS versions. This also gives us options if they ever decide to move the shutdown/reboot image display logic inside xochitl. |
You make a good point. Are you sure this belongs to the |
Good point. Perhaps a separate fix package similar to the wifi suspend fix? |
@matteodelabre poke? |
a new package sounds good, let me know if you need review |
On version 2.12 remarkable-shutdown is still a no-op, so it does look like a deliberate decision from rM. |
Okay, I've updated it to use its own package. I've also created a meta package so that we can make it easier to specify packages that need to be installed on the rM1 or rM2. I've added it as a dependency of the xochitl package so that as people upgrade they'll also get it. Eventually we can drop that dependency. I also tweaked toltec-bootstrap to handle installing it. |
package/open-remarkable-shutdown/remarkable-reboot-override.conf
Outdated
Show resolved
Hide resolved
package/open-remarkable-shutdown/remarkable-shutdown-override.conf
Outdated
Show resolved
Hide resolved
package/open-remarkable-shutdown/remarkable-reboot-override.conf
Outdated
Show resolved
Hide resolved
Should we also add |
Co-authored-by: Mattéo Delabre <[email protected]>
…conf Co-authored-by: Mattéo Delabre <[email protected]>
Perhaps, although we'd also need to change how bootstrap handles its additional dependencies: [[ ! -d /opt/etc/ssl/certs ]] && additional_packages+=(ca-certificates)
[[ ! -f /opt/bin/wget ]] && additional_packages+=(wget-ssl) |
Good point, let’s not complicate this PR further then, we can handle this separately. |
The changes look good, we’ll only need some testing to validate everything works as expected. |
There seems to be a bug from our build system: the |
We should probably fix that before merging. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me!
Tested on rM1 and rM2: on upgrade, toltec-base is automatically installed (on both devices). rM2 picks up rm2-suspend-fix and rM1 picks up open-remarkable-shutdown. On rM1, reboot and shutdown screens are shown properly after shutdown now
and reboot
.
On rM1, I also tested it with Oxide, making sure the reboot/shutdown images are shown after Oxide quits. |
This stable merge brings support for reMarkable OS releases 2.12.2 and 2.12.3. New packages ------------ * `toltec-base` - 1.0-1 (#532) - Metapackage used for specifying the default-installed packages * `open-remarkable-shutdown` - 1.0-1 (#532) - Overrides the `remarkable-shutdown` and `remarkable-reboot` default configurations to use `remarkable-splash` instead of the stock utility - Fixes custom poweroff/reboot screens not working on rM1 - Will be installed by default on rM1 Updated packages ---------------- * `ddvk-hacks` - 32.02-1 (#579, #584) - Add support for 2.12.2 - Add support for 2.12.3 * `display` - 1:0.0.16-1 (#578, #585) - Add support for rM2 2.12.2 - Add support for rM2 2.12.3 * `folly` - 0.0.1-2 (#564) - (Recipe improvements) * `keywriter` - 0.2~20-gddc9e73-1 (#565) - Reduce font size in edit mode - Set default buffer orientation to portrait - Rotate the buffer using Ctrl-Left/Ctrl-Right in view mode - Add Ctrl-Q shortcut to quit the app - Restore cursor position when switching between modes * `koreader` - 2022.03.1-1 (#562, #574, #575) - Don't use KOReader suspend/screensaver/autosuspend when Oxide is running - [2022.03.1 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03.1) - [2022.03 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03) - [2022.02 release notes](https://github.com/koreader/koreader/releases/tag/v2022.02) * `toltec-bootstrap` - 0.2.2-1 (#532) - Add transient dependency on `toltec-base` for existing installs * `xochitl` - 0.0.0-13 (#532, #567) - Make sure xochitl starts after/stops before the launcher - Force creating/removing the launcher.service alias when needed - Fix spurious warning when no pre-scripts are available for xochitl (e.g., on rM1) - Add transient dependency on `toltec-base` for existing installs * `rmfakecloud-proxy` - 0.0.3-3 (#561) - Add timeout to `status` command in case the upstream server is unreachable - Show feedback to the user while the upstream server is being pinged * `harmony` - 0.2.0-1 (#572) - Add layer support - Fix segfaults when showing empty load/import dialogs - Exporting canvas to PNG supports grays instead of dithering - RLE snapshots for history (less memory usage) - Support SYN_DROPPED in wacom events * `remux` - 0.2.2-1 - RLE snapshots use less memory - Save BPP when screenshotting current app - Filter palm events from gestures (less false positives) - Support SYN_DROPPED in wacom events
This stable merge brings support for reMarkable OS releases 2.12.2 and 2.12.3. New packages ------------ * `toltec-base` - 1.0-1 (#532) - Metapackage used for specifying the default-installed packages * `open-remarkable-shutdown` - 1.0-1 (#532) - Overrides the `remarkable-shutdown` and `remarkable-reboot` default configurations to use `remarkable-splash` instead of the stock utility - Fixes custom poweroff/reboot screens not working on rM1 - Will be installed by default on rM1 Updated packages ---------------- * `ddvk-hacks` - 32.02-1 (#579, #584) - Add support for 2.12.2 - Add support for 2.12.3 * `display` - 1:0.0.16-1 (#578, #585) - Add support for rM2 2.12.2 - Add support for rM2 2.12.3 * `keywriter` - 0.2~20-gddc9e73-1 (#565) - Reduce font size in edit mode - Set default buffer orientation to portrait - Rotate the buffer using Ctrl-Left/Ctrl-Right in view mode - Add Ctrl-Q shortcut to quit the app - Restore cursor position when switching between modes * `koreader` - 2022.03.1-1 (#562, #574, #575) - Don't use KOReader suspend/screensaver/autosuspend when Oxide is running - [2022.03.1 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03.1) - [2022.03 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03) - [2022.02 release notes](https://github.com/koreader/koreader/releases/tag/v2022.02) * `toltec-bootstrap` - 0.2.2-1 (#532) - Add transient dependency on `toltec-base` for existing installs * `xochitl` - 0.0.0-13 (#532, #567) - Make sure xochitl starts after/stops before the launcher - Force creating/removing the launcher.service alias when needed - Fix spurious warning when no pre-scripts are available for xochitl (e.g., on rM1) - Add transient dependency on `toltec-base` for existing installs * `rmfakecloud-proxy` - 0.0.3-3 (#561) - Add timeout to `status` command in case the upstream server is unreachable - Show feedback to the user while the upstream server is being pinged * `harmony` - 0.2.0-1 (#572) - Add layer support - Fix segfaults when showing empty load/import dialogs - Exporting canvas to PNG supports grays instead of dithering - RLE snapshots for history (less memory usage) - Support SYN_DROPPED in wacom events * `remux` - 0.2.2-1 (#572) - RLE snapshots use less memory - Save BPP when screenshotting current app - Filter palm events from gestures (less false positives) - Support SYN_DROPPED in wacom events
On the rM1 remarkable-shutdown and remarkable-reboot don't actually display anything anymore on my system. In order to resolve this, and ensure that shutdown and reboot images are properly displayed, I've replaced the calls with remarkable-splash.
This will have to be tested on both the rM1 and rM2.