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

Stable merge window for week 02 of 2021 #204

Merged
merged 4 commits into from
Jan 13, 2021
Merged

Conversation

matteodelabre
Copy link
Member

@matteodelabre matteodelabre commented Jan 9, 2021

Tooling changes:

  • Make stable the default branch.
  • Strip binaries by default.
  • Use systemctl is-enabled instead of systemctl list-unit-files to see whether a unit is enabled or not.

Installer changes:

  • Improve migration path from remarkable_entware regarding the location of the opt.mount configuration file.
  • Keep existing branch configuration if an install of Toltec already exists.

Updated packages (not listing the packages that were only updated because of the strip changes):

  • chessmarkable 0.5.1-1 → 0.6.0-2
  • koreader 2020.10-2 → 2020.12-2
  • oxide 2.0.1~beta-3 → 2.0.3~beta-1
  • fret 2.0.1~beta-3 → 2.0.3~beta-1
  • tarnish 2.0.1~beta-3 → 2.0.3~beta-1
  • erode 2.0.1~beta-3 → 2.0.3~beta-1
  • rot 2.0.1~beta-3 → 2.0.3~beta-1
  • rm2fb 1.0.0-3 → 1.0.0-5
  • remux 0.1.4-1 → 0.1.5-1

New packages:

  • keywriter 0.1.0-1
  • restream 0.0.0-1
  • rm2-suspend-fix 0.0.0-1
  • genie 0.1.0-1

@matteodelabre matteodelabre added the merge Weekly merge of the testing branch into the stable branch label Jan 9, 2021
@raisjn

This comment has been minimized.

Tooling changes:

* Make `stable` the default branch.
* Strip binaries by default.
* Use `systemctl is-enabled` instead of `systemctl list-unit-files` to
see whether a unit is enabled or not.

Installer changes:

* Improve migration path from remarkable\_entware regarding the location
of the `opt.mount` configuration file.
* Keep existing branch configuration if an install of Toltec already
exists.

Updated packages (not listing the packages that were only updated
because of the strip changes):

* chessmarkable 0.5.1-1 → 0.6.0-2
* koreader 2020.10-2 → 2020.12-1
* oxide 2.0.1\~beta-3 → 2.0.3\~beta-1
* rm2fb 1.0.0-3 → 1.0.0-5
* remux 0.1.4-1 → 0.1.5-1

New packages:

* keywriter 0.1.0-1
* restream 0.0.0-1
* rm2-suspend-fix 0.0.0-1
* genie 0.1.0-1
@matteodelabre

This comment has been minimized.

@Eeems Eeems mentioned this pull request Jan 9, 2021
@raisjn
Copy link
Contributor

raisjn commented Jan 11, 2021

usually, the 'repo.zip' appears in the checks section. after the KOReader commit push, that disappeared but is accessible by selecting the previous commit in the checks section. maybe this is an issue with the github workflow?

@raisjn
Copy link
Contributor

raisjn commented Jan 11, 2021

tested (on rM2):

  • chessmarkable: rotatable board works, but hard mode is slow. first move of PC took 15s, then 30+s
  • rm2fb: re-installing causes the display to go white because rm2fb doesn't persist display
  • remux: re-installed, restarted. three-finger tap gesture works
  • genie: re-installed, tested by modifying genie.conf and verifying gestures work
  • oxide: re-installed - tested oxide UI, its much snappier to open apps and menus. going to suspend does not show suspend screen, but does properly suspend/wake.
  • rm2-suspend-fix: i have tarnish + rm2-suspend-fix running and wifi works after sleep/wake cycles

untested:

  • restream -
  • keywriter -

@Eeems
Copy link
Member

Eeems commented Jan 11, 2021

Hmm, v2.0.3 is suppose to fix the suspend screen in oxide. Could you replicate with v2.1 as well?

Also, a better test of the suspend fix would be without tarnish running as it also has the same rmmod/modprobe code.

@LinusCDE
Copy link
Member

untested:

restream -
keywriter -

Both re-tested to work on rm1. 👍

chessmarkable: rotatable board works, but hard mode is slow. first move of PC took 15s, then 30+s

The slowness of the hard mode is normal. It is basically trying to be neigh unbeatable with has a lot of number crunching to do. It should most not get slower after the first few moves. On the rM 2 it should also be faster than on the rM 1 since it uses a different algorithm that can take advantage of both cores. I never got that verified though.

@raisjn
Copy link
Contributor

raisjn commented Jan 12, 2021

I just tested oxide again (but made sure to install tarnish+fret+erode 2.0.3~beta1) and suspend works properly

@raisjn
Copy link
Contributor

raisjn commented Jan 12, 2021

To get the repo.zip for the KOReader commit, can go to checks, then find the builds correctly subtask and the artifact will be attached to that.

raisjn
raisjn previously approved these changes Jan 12, 2021
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.

lgtmacro

@matteodelabre
Copy link
Member Author

I’m getting the following output with the bootstrap script from this PR. The one in stable works fine.

cat: can't open '/home/root/.entware/etc/opkg.conf': No such file or directory
INFO:  Fetching secure wget
INFO:  Creating /home/root/.entware and mounting to /opt
INFO:  Updating opt.mount location
Failed to get unit file state for opt.mount: No such file or directory
rm: can't remove '/etc/systemd/system/opt.mount': No such file or directory
ERROR: Unexpected error on line bootstrap:141 in function entware-mount
umount: can't unmount /opt: Invalid argument

Can someone else confirm?

raisjn
raisjn previously approved these changes Jan 13, 2021
matteodelabre added a commit that referenced this pull request Jan 13, 2021
Also improve the formatting of the message
This will be backported into the 2020-02 stable merge (#204)
matteodelabre added a commit that referenced this pull request Jan 13, 2021
Also improve the formatting of the message
This will be backported into the 2020-02 stable merge (#204)
@matteodelabre
Copy link
Member Author

Finished testing on my rM1. No more issues to report.

@matteodelabre matteodelabre merged commit c44fd5f into stable Jan 13, 2021
@matteodelabre matteodelabre deleted the merge/2021-02 branch January 13, 2021 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge Weekly merge of the testing branch into the stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants