Update innernet to v1.3.0 #358
Merged
Conversation
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
|
@Eeems My plan is foiled! |
Eeems
changed the title
|
@plan5 since you are the maintainer of the innernet package, could you test on the rM2 to make sure the package works and then approve the PR if it does? |
|
@Eeems Yes, I will. I've PMed you on Discord for some help with the server. |
|
Tested on 2.6.x and 2.7.x and innernet launches fine on rM2 with previously created config. |
|
@plan5 innernet 1.3.0 just came out, so we'll have to retest. |
plan5
reviewed
May 21, 2021
There was a problem hiding this comment.
opkg considers this a downgrade and refuses to downgrade from 1.3.0-beta-x-1 to 1.3.0-1.
I assume this is rather an issue for opkg than for this PR and since beta was never merged to stable I think this can be neglected (but I'm not approving right away because of that).
I've forced the installation and the tests mentioned above all still work.
|
Since this never made it to stable I'm inclined to agree with ignoring this issue. I think in the future we should skip the beta builds. @matteodelabre thoughts? |
|
I think it’s OK. Users who have chosen to use the testing branch should not expect smooth upgrades anyway. @plan5 In the future, you can use $ opkg compare-versions "1.3.0-beta-x-1" "<<" "1.3.0-1" && echo "Lower" || echo "Not lower"
Not lower
$ opkg compare-versions "1.3.0~beta-x-1" "<<" "1.3.0-1" && echo "Lower" || echo "Not lower"
Lower |
plan5
approved these changes
May 21, 2021
danshick
approved these changes
May 26, 2021
matteodelabre
pushed a commit
that referenced
this pull request
Jun 4, 2021
* Update to innernet 1.3.0
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@plan5 Looks like I beat you to this.