Skip to content
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

Merged
merged 28 commits into from
Mar 5, 2022

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Jan 5, 2022

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.

@Eeems Eeems added the packages Add or improve packages of the repository label Jan 5, 2022
@matteodelabre
Copy link
Member

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?

@Eeems
Copy link
Member Author

Eeems commented Jan 6, 2022

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.

@matteodelabre
Copy link
Member

You make a good point. Are you sure this belongs to the xochitl package though? This will make using remarkable-splash mandatory for most users. Would it make more sense to add this to the remarkable-splash package itself? Or in a new package?

@Eeems
Copy link
Member Author

Eeems commented Jan 6, 2022

You make a good point. Are you sure this belongs to the xochitl package though? This will make using remarkable-splash mandatory for most users. Would it make more sense to add this to the remarkable-splash package itself? Or in a new package?

Good point. Perhaps a separate fix package similar to the wifi suspend fix?

@Eeems
Copy link
Member Author

Eeems commented Jan 28, 2022

@matteodelabre poke?

@raisjn
Copy link
Contributor

raisjn commented Feb 6, 2022

a new package sounds good, let me know if you need review

@matteodelabre
Copy link
Member

On version 2.12 remarkable-shutdown is still a no-op, so it does look like a deliberate decision from rM.

@Eeems Eeems changed the title Fix remarkable-shutdown calls Fix remarkable-shutdown calls and add meta packages Feb 28, 2022
@Eeems Eeems changed the title Fix remarkable-shutdown calls and add meta packages Fix remarkable-shutdown calls and add toltec-meta package Feb 28, 2022
@Eeems
Copy link
Member Author

Eeems commented Feb 28, 2022

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/package Outdated Show resolved Hide resolved
package/open-remarkable-shutdown/package Show resolved Hide resolved
package/remarkable-splash/package Outdated Show resolved Hide resolved
package/toltec-meta/package Outdated Show resolved Hide resolved
package/xochitl/package Outdated Show resolved Hide resolved
package/toltec-meta/package Outdated Show resolved Hide resolved
@matteodelabre
Copy link
Member

Should we also add wget-ssl to the set of base packages?

@Eeems
Copy link
Member Author

Eeems commented Mar 2, 2022

Should we also add wget-ssl to the set of base packages?

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)

@matteodelabre
Copy link
Member

Perhaps, although we'd also need to change how bootstrap handles its additional dependencies

Good point, let’s not complicate this PR further then, we can handle this separately.

@matteodelabre
Copy link
Member

The changes look good, we’ll only need some testing to validate everything works as expected.

@matteodelabre matteodelabre self-requested a review March 3, 2022 00:20
@matteodelabre matteodelabre changed the title Fix remarkable-shutdown calls and add toltec-meta package Fix remarkable-shutdown calls and add toltec-base package Mar 3, 2022
@matteodelabre
Copy link
Member

There seems to be a bug from our build system: the open-remarkable-shutdown dependency gets added to the rM2 version of the base package.

@Eeems
Copy link
Member Author

Eeems commented Mar 5, 2022

We should probably fix that before merging.

Copy link
Member

@matteodelabre matteodelabre left a 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.

@matteodelabre
Copy link
Member

On rM1, I also tested it with Oxide, making sure the reboot/shutdown images are shown after Oxide quits.

@Eeems Eeems merged commit b97ccc3 into testing Mar 5, 2022
@Eeems Eeems deleted the fix-rm1-reboot branch March 5, 2022 23:14
matteodelabre added a commit that referenced this pull request Apr 17, 2022
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
matteodelabre added a commit that referenced this pull request Apr 23, 2022
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages Add or improve packages of the repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants