这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@Eeems
Copy link
Member

@Eeems Eeems commented Jul 11, 2021

  • Update Oxide to v2.2
  • Update Xochitl registration to run it in a chroot under Oxide.

@Eeems Eeems marked this pull request as ready for review July 11, 2021 19:08
@Eeems Eeems requested a review from matteodelabre July 11, 2021 19:09
@Eeems Eeems added the packages Add or improve packages of the repository label Jul 11, 2021
@raisjn
Copy link
Contributor

raisjn commented Jul 11, 2021

looks like an awesome release! is there anything specific you want help with testing? (nice work with chroot!)

@Eeems
Copy link
Member Author

Eeems commented Jul 11, 2021

looks like an awesome release! is there anything specific you want help with testing? (nice work with chroot!)

I wouldn't mind more testing of the chroot to make sure there are no large bugs that were missed before making it the default.

@matteodelabre
Copy link
Member

I found references to /opt/etc/draft/icons/{erode,oxide,anxiety}-splash.png in application registration files, but those files don’t exist in the packages. Also, anxiety’s icon is stored in /opt/etc/draft/icons/image.svg: why not call it anxiety.png?

While testing gestures, I noticed that Oxide’s gesture to disable gestures by swiping down from the upper border conflicts with Xochitl’s gesture for closing documents.

Regarding the chroot, is Xochitl supposed to run in a chroot in the current configuration? Or do I need to change something to test it? From my tests, it doesn’t seem to run in a chroot by default.

Other than that, everything looks good, thanks for your work on this release!

@Eeems
Copy link
Member Author

Eeems commented Jul 12, 2021

I found references to /opt/etc/draft/icons/{erode,oxide,anxiety}-splash.png in application registration files, but those files don’t exist in the packages.

Odd, those should be pulled across. Qt Creator is handling them when installing with that. I'll have to poke around a bit to see why it's missed.

Also, anxiety’s icon is stored in /opt/etc/draft/icons/image.svg: why not call it anxiety.png?

Because it's just a generic image icon.

While testing gestures, I noticed that Oxide’s gesture to disable gestures by swiping down from the upper border conflicts with Xochitl’s gesture for closing documents.

If you want to trigger Xochitl's closing document gesture, you can swipe from lower than the edge of the screen.

Regarding the chroot, is Xochitl supposed to run in a chroot in the current configuration? Or do I need to change something to test it? From my tests, it doesn’t seem to run in a chroot by default.

If you install the new xochitl package included in these changes it will run in a chroot.

@Eeems
Copy link
Member Author

Eeems commented Jul 12, 2021

Upon reviewing the project files, they do include references to the *-splash.png files. Not entirely sure why they are being missed.
https://github.com/Eeems/oxide/blob/master/applications/screenshot-viewer/anxiety.pro#L33

@Eeems
Copy link
Member Author

Eeems commented Jul 12, 2021

Ah, I forgot to add them to the package file.

@matteodelabre
Copy link
Member

matteodelabre commented Jul 14, 2021

The missing resources issue is fixed, thanks!

If you install the new xochitl package included in these changes it will run in a chroot.

Sorry, I forgot to upgrade the xochitl package indeed. Starting chrooted Xochitl from Oxide on rM2, I don’t get any on-screen output. The logs show that Xochitl is running, though. I think the Xochitl wrapper script is failing, I see the following error in the logs:

grep: /opt/etc/xochitl.env.d/*: No such file or directory

@Eeems
Copy link
Member Author

Eeems commented Jul 14, 2021

The missing resources issue is fixed, thanks!

If you install the new xochitl package included in these changes it will run in a chroot.

Sorry, I forgot to upgrade the xochitl package indeed. Starting chrooted Xochitl from Oxide on rM2, I don’t get any on-screen output. The logs show that Xochitl is running, though. I think the Xochitl wrapper script is failing, I see the following error in the logs:

grep: /opt/etc/xochitl.env.d/*: No such file or directory

Ah, makes sense. I'll add the folder to the chroot.

@matteodelabre
Copy link
Member

That did fix the script error, but unfortunately I still don’t have any display output.

@Eeems
Copy link
Member Author

Eeems commented Jul 14, 2021

That did fix the script error, but unfortunately I still don’t have any display output.

Anything helpful in the logs? @LinusCDE wasn't having issues when using the builds from my repo.

@matteodelabre
Copy link
Member

It’s now working, must have been some kind of transient issue.

@Eeems
Copy link
Member Author

Eeems commented Jul 14, 2021

It’s now working, must have been some kind of transient issue.

You would have to make sure to kill xochitl, and then restart tarnish, or reload the applications list before launching it again for the change to take affect.

@Eeems Eeems merged commit 9f0155e into testing Jul 14, 2021
@Eeems Eeems deleted the Eeems-patch-1 branch July 14, 2021 21:27
@matteodelabre
Copy link
Member

You would have to make sure to kill xochitl, and then restart tarnish, or reload the applications list before launching it again for the change to take affect.

That must have been something like this yes.

@LinusCDE
Copy link
Member

I'll review it tomorrow.

@Eeems
Copy link
Member Author

Eeems commented Jul 15, 2021

I'll review it tomorrow.

We believe that this is already resolved by #386

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.

5 participants