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

Update KOReader to 2021.04 #348

Merged
merged 3 commits into from
May 2, 2021
Merged

Update KOReader to 2021.04 #348

merged 3 commits into from
May 2, 2021

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Apr 22, 2021

Also change maintainer to Eeems
@Eeems Eeems requested a review from raisjn April 22, 2021 14:24
@Eeems Eeems added the packages Add or improve packages of the repository label Apr 22, 2021
@Eeems
Copy link
Member Author

Eeems commented Apr 23, 2021

Quick test on rM1 shows it installs fine, opens, touch/pen work. Network control seems to work as well, although it's not playing nice with Oxide, as the network list is empty in Oxide after using KOReader to connect.

@raisjn
Copy link
Contributor

raisjn commented Apr 25, 2021

cc @snelg

@snelg
Copy link

snelg commented Apr 25, 2021

I don't use toltec, but I'm willing to help test stuff. So I installed toltec on my rm2, switched to the testing configuration, and then installed Oxide. Not sure where things went wrong, but I couldn't get Oxide to work at all. I'm on firmware 2.6, so maybe that's the problem?

@raisjn
Copy link
Contributor

raisjn commented Apr 25, 2021

the version of qt in 2.6 is incompatible with the toolchains, but there is a toltec image for qt that can be used to build oxide. this qt issue has been holding up toltecs official release and support of rM2 :(

you can also try remux (no dep on qt)

@raisjn
Copy link
Contributor

raisjn commented Apr 25, 2021

cc @witosso for oxide builds on 2.6

@snelg
Copy link

snelg commented Apr 25, 2021

Same basic results as Eeems. WiFi in KOReader works a little different under the hood, so live-switching between KOReader and Xochitl had a little bit of strangeness.
They both use wpa_supplicant, but Xochitl launches it with the -u flag for DBus interface, while KOReader launches it with the flags -i wlan0 -C /var/run/wpa_supplicant -B so it can use wpa_cli to interface.

Aaaand then I effectively bricked my rm2 :( :( :(
My own dang fault; step-by-step manual cleaning out all the toltec packages seemed like a hassle, and I have my own KOReader stuff backed up. So I used the "Factory Reset" option in Xochitl.
That was a mistake. I'm not sure what the Factory Reset cleans up and what it doesn't, but

  1. it's stuck on the "reMarkable is starting" screen
  2. it definitely changed the root password; USB ssh port works, but password is rejected

Sigh. Time to get some hardware, I guess. https://github.com/ddvk/remarkable2-recovery

@Eeems
Copy link
Member Author

Eeems commented Apr 25, 2021

I'm not sure what the Factory Reset cleans up and what it doesn't, but

From my understanding, just your user data. Which means if you've switched to having something other than xochitl enabled it will break things.

@snelg
Copy link

snelg commented Apr 25, 2021

Which means if you've switched to having something other than xochitl enabled it will break things.

Yeah, I figured that part out :)

Copy link
Contributor

@raisjn raisjn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aaaand then I effectively bricked my rm2 :( :( :(

i'm really sorry! if you go on discord, i'm sure bokluk and others will help you recover when hardware arrives

They both use wpa_supplicant, but Xochitl launches it with the -u flag for DBus interface, while KOReader launches it with the flags -i wlan0 -C /var/run/wpa_supplicant -B so it can use wpa_cli to interface.

is this a blocker?

package/koreader/package Outdated Show resolved Hide resolved
@Eeems
Copy link
Member Author

Eeems commented May 1, 2021

They both use wpa_supplicant, but Xochitl launches it with the -u flag for DBus interface, while KOReader launches it with the flags -i wlan0 -C /var/run/wpa_supplicant -B so it can use wpa_cli to interface.

is this a blocker?

I don't think so. It's a valid way to try to handle wifi on the device. I do think we should open an issue or PR for KOReader to have it handle wifi by just using the standard DBus interface to play nicer with Xochitl and Oxide though.

@snelg
Copy link

snelg commented May 1, 2021

Aaaand then I effectively bricked my rm2 :( :( :(

i'm really sorry! if you go on discord, i'm sure bokluk and others will help you recover when hardware arrives

Thanks for the sympathy :)
I hit a few snags along the way (bad soldering, accidentally using a USB-C cable only wired for USB 2.0, etc.), but managed to work through them. My rm2 is working fine again.

@raisjn raisjn merged commit 3b3c883 into testing May 2, 2021
@Eeems Eeems deleted the Eeems-patch-1 branch May 2, 2021 21:33
danshick pushed a commit to danshick/toltec that referenced this pull request May 5, 2021
danshick added a commit to danshick/toltec that referenced this pull request May 5, 2021
matteodelabre added a commit that referenced this pull request Jul 21, 2021
Important notices:

* When upgrading, users should run `opkg update && opkg upgrade` **twice** because of the changes introduced by this merge. (#310)
* Toltec **no longer supports** OS releases **earlier than 2.6**. You can check your current OS version in the settings panel. Please upgrade to 2.6 or newer after upgrading your Toltec install. (#366)
* To re-enable Toltec, **run `toltecctl reenable`** instead of the previous `entware-reenable` script that has been removed with this update.

Major change: The repository is now split into architecture subfolders. The `rmall` subfolder contains packages that can run both on reMarkable 1 and reMarkable 2 without modification. The `rm1` and `rm2` subfolders contain packages that are specific to each of the two devices. This change requires updating the Opkg configuration to point to the appropriate architectures. The migration is automated by placing an upgrade to the `toltec-bootstrap` package in the root folder of the repo that contains a migration script. (Note that this package is not generated automatically by our build system but will be added manually by the server administrator.)

New packages:

* bash-completion - 2.11-3 (#277, #375)
* display - 1.0.1-7 _(replaces the server part of the old rm2fb package)_ (#310)
* fuse - 1.0.0-2 (#331)
* gocryptfs - 2.0-beta2 (#318)
* innernet - 1.3.1-2 (#350, #358, #361)
* netsurf - 0.4.0-1 (#339)
* puzzles - 0.2.2-2 (#326)
* remarkable-stylus - 0.0.3-1 (#383)
* rm2fb-client - 1.0.1-7 _(replaces the client part of the old rm2fb package)_ (#310)
* tilem - 0.0.7-1 (#352)
* toltec-completion - 0.2.0-1 (#277)
* yaft - 0.0.4-3 (#261, #353)
* zoneinfo-utils - 2021a-2 (#182)

Updated packages:

* appmarkable - 0.0.0-11
* bufshot - 0.1.0-5
* calculator - 0.0.0-15
* chessmarkable - 0.7.1-2 (#362, #373)
* ddvk-hacks - 23.02-1 (#385)
* draft - 0.2.0-20
* evtest - 1.34-3
* fbink fbdepth fbink-doom - 1.23.1-4
* fingerterm - 1.3.5-14
* genie - 0.1.5-3
* harmony - 0.1.3-3
* iago - 0.1.0-4
* keywriter - 0.1.0-3
* koreader - 2021.06-1 (#330, #348, #357, #378)
* lamp - 0.1.0-4
* libdlib libdlib-dev - 19.21-2
* libvncserver libvncclient libvncserver-dev - 0.9.13-2
* mines - 0.1.2-4
* nao - 0.1.3-3
* oxide erode fret rot tarnish decay corrupt anxiety - 2.2-1 (#382)
* plato - 0.9.17-2 (#344)
* quickjs - 2020.11.08-2
* recrossable - 0.0.0-7
* remarkable-splash - 1.0-5
* remux - 0.1.9-3
* restream - 1.1-2
* retris - 0.6.3-3
* rmservewacominput - 0.3.0-2
* simple - 0.1.4-3
* templatectl - 0.1.3-3
* toltec-bootstrap - 0.1.0-1 _(includes toltecctl)_ (#379)
* vnsee - 0.4.0-2 (#355)
* wikipedia - 0.1.0-3
* wireguard - 1.0.20210219-2
* xochitl - 0.0.0-7 (#383, #382, #386)
* zshelf - 0.3.1-3

Website: The source files and scripts used for generating the website have been transferred to a separate repository (<https://github.com/toltec-dev/web>). A website rebuild is triggered automatically from this repository’s workflow when the stable branch is updated, so that the displayed checksum of the bootstrap script is always accurate.
matteodelabre added a commit that referenced this pull request Jul 31, 2021
Important notices:

* When upgrading, users should run `opkg update && opkg upgrade` **twice** because of the changes introduced by this merge. (#310)
* Toltec **no longer supports** OS releases **earlier than 2.6**. You can check your current OS version in the settings panel. If you’re still running on 2.5 or earlier, please upgrade to 2.6 or newer after upgrading your Toltec install. (#366)

Less important notices:

* To re-enable Toltec after a system upgrade, **run `toltecctl reenable`** instead of the previous `entware-reenable` script that has been removed with this update.
* You can now easily uninstall Toltec by running `toltec uninstall`.
* This release marks the end of our work towards transitioning to a new repository layout. This means that **stable will be updated more frequently from now on.** If you switched to the testing branch because stable has been outdated for a few months, and if you prefer to run stable releases, you can go back to the stable branch by running `toltecctl switch-branch stable`.

Layout change: The repository is now split into architecture subfolders. The `rmall` subfolder contains packages that can run both on reMarkable 1 and reMarkable 2 without modification. The `rm1` and `rm2` subfolders contain packages that are specific to each of the two devices. This change requires updating the Opkg configuration to point to the appropriate architectures. The migration is automated by placing an upgrade to the `toltec-bootstrap` package in the root folder of the repo that contains a migration script.

New packages:

* bash-completion - 2.11-3 (#277, #375)
* display - 1.0.1-7 _(replaces the server part of the old rm2fb package)_ (#310)
* fuse - 1.0.0-3 (#331)
* gocryptfs - 2.0-beta2 (#318)
* innernet-client - 1.3.1-2 (#350, #358, #361)
* netsurf - 0.4.0-2 (#339)
* puzzles - 0.2.2-3 (#326)
* remarkable-stylus - 0.0.3-1 (#383)
* rm2fb-client - 1.0.1-7 _(replaces the client part of the old rm2fb package)_ (#310)
* tilem - 0.0.7-2 (#352)
* toltec-completion - 0.2.0-1 (#277)
* yaft - 0.0.4-4 (#261, #353)
* zoneinfo-utils - 2021a-2 (#182)

Updated packages:

* appmarkable - 0.0.0-11
* bufshot - 0.1.0-5
* calculator - 0.0.0-15
* chessmarkable - 0.8.0-1 (#362, #373, #392)
* ddvk-hacks - 23.02-1 (#385)
* draft - 0.2.0-20
* evtest - 1.34-3
* fbink fbdepth fbink-doom - 1.23.2-1 (#387)
* fingerterm - 1.3.5-14
* genie - 0.1.5-3
* harmony - 0.1.3-3
* iago - 0.1.0-4
* keywriter - 0.1.0-3
* koreader - 2021.07-1 (#330, #348, #357, #378, #389)
* lamp - 0.1.0-4
* libdlib libdlib-dev - 19.21-2
* libvncserver libvncclient libvncserver-dev - 0.9.13-2
* mines - 0.1.2-4
* nao - 0.1.3-3
* oxide erode fret rot tarnish decay corrupt anxiety - 2.2.1-1 (#382)
* plato - 0.9.17-2 (#344)
* quickjs - 2020.11.08-2
* recrossable - 0.0.0-7
* remarkable-splash - 1.0-5
* remux - 0.1.9-4
* restream - 1.1-2
* retris - 0.6.3-3
* rmservewacominput - 0.3.0-2
* simple - 0.1.4-3
* templatectl - 0.1.3-3
* toltec-bootstrap - 0.1.0-1 _(includes toltecctl)_ (#379)
* vnsee - 0.4.0-2 (#355)
* wikipedia - 0.1.0-3
* wireguard - 1.0.20210219-2
* xochitl - 0.0.0-7 (#383, #382, #386)
* zshelf - 0.3.1-3

Website: The source files and scripts used for generating the website have been transferred to a separate repository (<https://github.com/toltec-dev/web>). A website rebuild is triggered automatically from this repository’s workflow when the stable branch is updated, so that the displayed checksum of the bootstrap script is always accurate.
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