Stable merge for week 13 of 2021 #320

raisjn · 2021-03-23T18:58:44Z

new packages:
[ddvk-hacks] Add ddvk-hacks (#247)
[rmkit] add bufshot app, add lamp, add iago, add changelog (#276)
[wikipedia] Initial wikipedia package.
[deps] libdlib and libvncserver

updated packages:
~~[wireguard][1.0.20210219] - Updated package (and include wireguard-tools) (#285)~~
[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (#301)
[recrossable] Update recrossable (#312)
[appmarkable] Update appmarkable to 0.0.0-9 and rmservewacominput to 0.3.0-1 (#308) with rm2 support
[rmkit] patch genie to fix crash in testing (#304)
[oxide] Update Oxide to v2.1.2 (#241)
[rm2fb] update rm2fb with wait ioctl and no-op on rM1 (#298)
[rmkit] update rmkit to latest (2021-02-17) (#286)
~~[zshelf][0.3.1] - Updated Package (#287)~~

tooling:
Pin the Ubuntu version used in workflows to 20.04 (#316)
Provide better version number error messages (#314)
util.auto_extract: Extract broken symlinks and missing directories (#302)
build-time dependencies (#274).

new packages: [ddvk-hacks] Add ddvk-hacks (#247) updated packages: [wireguard][1.0.20210219] - Updated package (and include wireguard-tools) (#285) [rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (#301) [recrossable] Update recrossable (#312) [wikipedia] Initial wikipedia package. [appmarkable] Update appmarkable to 0.0.0-9 and rmservewacominput to 0.3.0-1 (#308) with rm2 support [rmkit] patch genie to fix crash in testing (#304) [oxide] Update Oxide to v2.1.2 (#241) [rm2fb] update rm2fb with wait ioctl and no-op on rM1 (#298) [rmkit] add bufshot app, add lamp, add iago, add changelog (#276) [rmkit] update rmkit to latest (2021-02-17) (#286) [zshelf][0.3.1] - Updated Package (#287) tooling: Pin the Ubuntu version used in workflows to 20.04 (#316) Provide better version number error messages (#314) util.auto_extract: Extract broken symlinks and missing directories (#302) change web background color to #fcfaf8 (#280) Implement build-time package dependencies (#274) Rewrite repo-build-web in Python (#266) Print last 50 lines of output on build error (#263) Hardcode REMOTE_HTTP secret in PR workflows (#262) Rewrite repo-build and package-build in Python (#218) Make bootstrap execution conditional on hash verification (#257) Add Toltec web home page (#193)

Eeems · 2021-03-25T16:31:35Z

@erolx did you approve this because you went through and tested everything? If so, what device did you test on, and what testing did you do?

matteodelabre · 2021-03-25T23:24:53Z

I removed the zoneinfo-utils package along with the changes to the bootstrap script from this merge, for the same reasons as in the last merge (#288). This is blocked by #303.

raisjn · 2021-03-26T00:18:41Z

thank you for taking care of all of that! i cut this release one because i think our backlog is growing and it will get harder and harder to test / release.

what command do you use for the git merge? (git merge testing -X theirs?) my logs tend to get weird with that merge and i thought it had too much commits, so i was trying to figure out the proper place to end

if @erolx did any testing, that would be great!

matteodelabre · 2021-03-26T12:45:57Z

thank you for taking care of all of that! i cut this release one because i think our backlog is growing and it will get harder and harder to test / release.

I totally agree. Thanks for doing this!

what command do you use for the git merge? (git merge testing -X theirs?) my logs tend to get weird with that merge and i thought it had too much commits, so i was trying to figure out the proper place to end

I usually branch off the latest stable commit and copy the changes from testing using git checkout --no-overlay testing -- .

package/evtest/package

raisjn · 2021-03-28T19:49:09Z

tested on rM2 w. 2.5:

ddvk hacks, install and uninstall - verify hacks show up in UI
rmkit: bufshot, lamp, genie and iago: saved a fb.png with bufshot, verified it. called up iago using genie, then drew onto screen with lamp (a circle)
wikipedia: installed and loaded wikipedia, opened keyboard. don't have a link to test blue on yet
recrossable: installed, verified orderings of puzzle. drew letters into puzzle
rmkit bump: mines (game over screen), harmony (grayscale colors), genie, remux
oxide: installed fret, decay, erode, oxide and tarnish, turned on oxide and launched / killed a bunch of apps, verified it works. didn't try any suspend stuff yet. did verify that lock screen works (already had a PIN setup)

did not test yet:

libdlib, libvncserver
wireguard
appmarkable, rmservewacominput
rm2fb

raisjn · 2021-03-28T21:15:20Z

when i uninstall oxide (& co), i don't get a message about how to turn xochitl back on.

reMarkable: ~/.cache/toltec/ opkg remove oxide fret tarnish erode decay
Removing package oxide from root...
Reloading Oxide applications: Done!
Removing package fret from root...
Reloading Oxide applications: Done!
Removing package erode from root...
Reloading Oxide applications: Done!
Removing package decay from root...
Reloading Oxide applications: Done!
Collected errors:
 * print_dependents_warning: Package tarnish is depended upon by packages:
 * print_dependents_warning:    rot
 * print_dependents_warning:    decay
 * print_dependents_warning:    erode
 * print_dependents_warning: These might cease to work if package tarnish is removed.

 * print_dependents_warning: Force removal of this package with --force-depends.
 * print_dependents_warning: Force removal of this package and its dependents
 * print_dependents_warning: with --force-removal-of-dependent-packages.
reMarkable: ~/.cache/toltec/ opkg remove rot decade erode
Removing package rot from root...

Eeems · 2021-03-28T21:17:46Z

@raisjn Looks like you didn't remove tarnish

raisjn · 2021-03-28T21:22:34Z

thanks for catching that! it's a little bit of a mess how many packages there are to deal with - maybe a virtual package will help.

reMarkable: ~/.cache/toltec/ opkg install tarnish_2.1.2~1_armv7-3.2.ipk
Installing tarnish (2.1.2~1) to root...
Configuring tarnish.
reMarkable: ~/.cache/toltec/ systemctl enable tarnish --now
Created symlink /etc/systemd/system/multi-user.target.wants/tarnish.service → /lib/systemd/system/tarnish.service.
reMarkable: ~/.cache/toltec/ systemctl disable xochitl --now
reMarkable: ~/.cache/toltec/ opkg remove tarnish
Removing package tarnish from root...
Stopping tarnish
Disabling tarnish
Removed /etc/systemd/system/multi-user.target.wants/tarnish.service.
reMarkable: ~/.cache/toltec/

(EDIT: i don't see any useful messages in the above about turning xochitl back on)

matteodelabre · 2021-03-28T21:22:35Z

Testing on rM2 @ 2.5 too:

wireguard — I tried to bring up a config using wg-quick and I got an error saying that resolvconf was not found. The system’s DNS seems to be managed by systemd, so we would need to have resolvectl installed and symlink resolvconf to resolvectl for this to work. Unfortunately, resolvectl is not available out of the box nor in Entware. @jonahweissman
rmservewacominput & appmarkable — Tested the new gesture to quit appmarkable. Ran rmservewacominput and the pcWacomToMouse script on client side. Checked that I see output on the client when interacting with the pen.

I think we can consider that libdlib has been tested, since @raisjn tested recrossable and this app makes use of libdlib.

matteodelabre · 2021-03-29T23:01:41Z

I’m moving the WireGuard conversation to #323 and removing the changes to the wireguard package from this merge so that we can move forward with the rest of the packages.

matteodelabre · 2021-03-30T14:44:41Z

wikipedia and ddvk-hacks have been tested by @Eeems on rM1.

matteodelabre · 2021-03-30T21:54:37Z

rm2fb
- On rM1, checked that installing rm2fb works and that apps still work when prefixed with rm2fb-client.
- On rM2 (system 2.5), installed KOReader v2021.01 (which is not included in this merge) and checked that the bug mentioned in this comment is fixed by the new rm2fb version.
- On rM2 (system 2.6), ran rm2fb-client xochitl and checked that the following log lines appear:

found update_fn at 311c00
found create_fn at 314168
found shutdown_fn at 31368c
found wait_fn at 31410c

matteodelabre · 2021-03-31T20:57:15Z

Testing on rM1:

rmkit, recrossable (& libdlib), oxide: followed the same testing protocol as @raisjn above.
rmservewacominput (& appmarkable): followed the same steps as on rM2 above.
libvncserver (via vnsee): connected to a VNC server through VNSee, checked that the display shows up properly and that I could interact with the touchscreen and the pen.

matteodelabre

I think we’re clear for merging.

Eeems

lgtm as well

Eeems added the merge Weekly merge of the testing branch into the stable branch label Mar 23, 2021

Eeems mentioned this pull request Mar 23, 2021

[client] support xochitl 2.6 ddvk/remarkable2-framebuffer#55

Merged

erolx previously approved these changes Mar 25, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

Leave out toltec-bootstrap, zoneinfo-utils and bootstrap

9a7e165

matteodelabre dismissed erolx’s stale review via 9a7e165 March 25, 2021 23:23

dcardin reviewed Mar 26, 2021

View reviewed changes

package/evtest/package Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Rollback wireguard

5b7616f

matteodelabre changed the title ~~stable merge for week XX of 2021:~~ Stable merge for week 13 of 2021 Mar 30, 2021

matteodelabre approved these changes Mar 31, 2021

View reviewed changes

Eeems approved these changes Mar 31, 2021

View reviewed changes

matteodelabre merged commit 83dfead into stable Mar 31, 2021

matteodelabre deleted the stable_merge_10 branch March 31, 2021 21:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stable merge for week 13 of 2021 #320

Stable merge for week 13 of 2021 #320

raisjn commented Mar 23, 2021 •

edited by matteodelabre

Loading

Eeems commented Mar 25, 2021

This comment has been minimized.

matteodelabre commented Mar 25, 2021

raisjn commented Mar 26, 2021

matteodelabre commented Mar 26, 2021

raisjn commented Mar 28, 2021 •

edited

Loading

raisjn commented Mar 28, 2021

Eeems commented Mar 28, 2021

raisjn commented Mar 28, 2021 •

edited

Loading

matteodelabre commented Mar 28, 2021 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

matteodelabre commented Mar 29, 2021

matteodelabre commented Mar 30, 2021

matteodelabre commented Mar 30, 2021 •

edited

Loading

matteodelabre commented Mar 31, 2021

matteodelabre left a comment

Eeems left a comment

Stable merge for week 13 of 2021 #320

Stable merge for week 13 of 2021 #320

Conversation

raisjn commented Mar 23, 2021 • edited by matteodelabre Loading

Eeems commented Mar 25, 2021

This comment has been minimized.

matteodelabre commented Mar 25, 2021

raisjn commented Mar 26, 2021

matteodelabre commented Mar 26, 2021

raisjn commented Mar 28, 2021 • edited Loading

raisjn commented Mar 28, 2021

Eeems commented Mar 28, 2021

raisjn commented Mar 28, 2021 • edited Loading

matteodelabre commented Mar 28, 2021 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

matteodelabre commented Mar 29, 2021

matteodelabre commented Mar 30, 2021

matteodelabre commented Mar 30, 2021 • edited Loading

matteodelabre commented Mar 31, 2021

matteodelabre left a comment

Choose a reason for hiding this comment

Eeems left a comment

Choose a reason for hiding this comment

raisjn commented Mar 23, 2021 •

edited by matteodelabre

Loading

raisjn commented Mar 28, 2021 •

edited

Loading

raisjn commented Mar 28, 2021 •

edited

Loading

matteodelabre commented Mar 28, 2021 •

edited

Loading

matteodelabre commented Mar 30, 2021 •

edited

Loading