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.

Sign up for GitHub

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

Jump to bottom

[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) #301

Merged
merged 5 commits into from
Mar 21, 2021
Merged

[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) #301

merged 5 commits into from
Mar 21, 2021

Conversation

raisjn
Copy link
Contributor

@raisjn raisjn commented Mar 2, 2021

No description provided.

@Eeems
Copy link
Member

Eeems commented Mar 2, 2021

I would recommend changing the source to pull from the tag as well.

@raisjn
Copy link
Contributor Author

raisjn commented Mar 2, 2021

I would recommend changing the source to pull from the tag as well.

feel free to, otherwise will to that on the next PR

@raisjn
Copy link
Contributor Author

raisjn commented Mar 2, 2021

i'll deal with the build stuff later, i thought it would be a simple change (but need to update some other stuff inside rm2fb)

@raisjn raisjn mentioned this pull request Mar 2, 2021
Closed
@matteodelabre matteodelabre added the packages Add or improve packages of the repository label Mar 4, 2021
@raisjn raisjn marked this pull request as draft March 7, 2021 13:03
@raisjn raisjn marked this pull request as ready for review March 21, 2021 02:10
@raisjn
Copy link
Contributor Author

raisjn commented Mar 21, 2021

(looks like we need to have the python tooling print out the package files)

@raisjn raisjn changed the title [rm2fb] match rm2fb version to original repo version (v1.0.1) [rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) Mar 21, 2021
@raisjn raisjn mentioned this pull request Mar 21, 2021
Closed
@matteodelabre
Copy link
Member

matteodelabre commented Mar 21, 2021 •
edited
Loading

(looks like we need to have the python tooling print out the package files)

Currently it does so only in verbose mode. Do you think we should print it even in normal mode? Or should we switch the CI to verbose mode? (This will include all the build logs, even if the build succeeds.)

@matteodelabre
Copy link
Member

The rm2fb-client and rm2fb-server scripts, rm2fb systemd service, and rm2fb.conf systemd configuration need to be updated for the new library version. I added two symlinks librm2fb_{client,server}.so.1 -> librm2fb_{client,server}.so.1.0.1 to ease future updates and changed the configurations accordingly.

@raisjn
Copy link
Contributor Author

raisjn commented Mar 21, 2021

i think it's fine to always print out when in ci. can be all logs or just files

thanks for fixing the symlinks

matteodelabre
matteodelabre approved these changes Mar 21, 2021
View reviewed changes
Copy link
Member

@matteodelabre matteodelabre left a comment

Choose a reason for hiding this comment

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

I did not find any issue when testing this on rM2, both with versions 2.5 and 2.6. Here’s what I tested:

  • That the rm2fb service starts and stays alive.
  • That running rm2fb-client /usr/bin/xochitl starts xochitl and shows the correct address for each function replaced by the shim.
  • That running another app with rm2fb-client works, provided the app is compiled for the right Qt version if applicable.

@raisjn
Copy link
Contributor Author

raisjn commented Mar 21, 2021

I just finished testing installation/upgrade on 2.5. I did have a small hiccup after I installed new rm2fb where screen had artifacts, but I restarted rm2fb and remux and it went away. Not sure what caused it yet (likely two server or xochitl + server?)

  • installed package
  • restart rm2fb
  • restart remux
  • click around inside xochitl
  • see artifact
  • restart both rm2fb/remux, artifacts go away

@raisjn raisjn merged commit a28dce2 into testing Mar 21, 2021
raisjn pushed a commit to rmkit-dev/toltec that referenced this pull request Mar 23, 2021
stable merge for week XX of 2021:
e3a11cf 
new packages:
    [ddvk-hacks] Add ddvk-hacks (toltec-dev#247)

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

tooling:
    Pin the Ubuntu version used in workflows to 20.04 (toltec-dev#316)
    Provide better version number error messages (toltec-dev#314)
    util.auto_extract: Extract broken symlinks and missing directories (toltec-dev#302)
    change web background color to #fcfaf8 (toltec-dev#280)
    Implement build-time package dependencies (toltec-dev#274)
    Rewrite repo-build-web in Python (toltec-dev#266)
    Print last 50 lines of output on build error (toltec-dev#263)
    Hardcode REMOTE_HTTP secret in PR workflows (toltec-dev#262)
    Rewrite repo-build and package-build in Python (toltec-dev#218)
    Make bootstrap execution conditional on hash verification (toltec-dev#257)
    Add Toltec web home page (toltec-dev#193)
@raisjn raisjn mentioned this pull request Mar 23, 2021
Merged
matteodelabre added a commit that referenced this pull request Mar 31, 2021
@raisjn @matteodelabre
Stable merge for week 13 of 2021 (#320)
83dfead 
New packages:

* bufshot - 0.1.0-2 (#276)
* ddvk-hacks - 17.04-1 (#247)
* iago - 0.1.0-1 (#276)
* lamp - 0.1.0-1 (#276)
* libdlib, libdlib-dev - 19.21-1 (#274)
* libvncserver, libvncserver-dev - 0.9.13-1 (#274)
* wikipedia - 0.1.0-2 (#311)

Updated packages:

* appmarkable - 0.0.0-9 (#308)
* decay - 2.1.2~1 (#241)
* erode - 2.1.2~1 (#241)
* fret - 2.1.2~1 (#241)
* genie - 0.1.4-2 (#304)
* harmony - 0.1.2-1 (#286)
* mines - 0.1.2-1 (#286)
* nao - 0.1.2-1 (#286)
* oxide - 2.1.2~1 (#241)
* recrossable - 0.0.0-5 (#274, #312)
* remux - 0.1.8-1 (#286)
* rm2fb - 1.0.1-1 (#298, #301)
* rmservewacominput - 0.3.0-1 (#308)
* rot - 2.1.2~1 (#241)
* simple - 0.1.3-1 (#286)
* tarnish - 2.1.2~1 (#241)
* vnsee - 0.3.1-2 (#274)

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)

Co-authored-by: okay <okay@arkose>
Co-authored-by: Mattéo Delabre <spam@delab.re>
danshick pushed a commit to danshick/toltec that referenced this pull request May 5, 2021
@raisjn @danshick
[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (toltec-dev#301)
a7eb0fa 
* match rm2fb version to original repo version
* update to work with 2.6 (and bump to 1.0.1)
* Create librm2fb_*.so.1 symlinks & point to them
danshick added a commit to danshick/toltec that referenced this pull request May 5, 2021
@danshick
Revert "[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (tolte…
237bf03 
…c-dev#301)"

This reverts commit a7eb0fa.
@matteodelabre matteodelabre deleted the raisjn-patch-rm2fb-1 branch May 8, 2021 09:22
LinusCDE pushed a commit that referenced this pull request Jun 3, 2021
@raisjn @LinusCDE
[rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (#301)
1546c61 
* match rm2fb version to original repo version
* update to work with 2.6 (and bump to 1.0.1)
* Create librm2fb_*.so.1 symlinks & point to them
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matteodelabre matteodelabre matteodelabre approved these changes

Assignees
No one assigned
Labels
packages Add or improve packages of the repository
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@raisjn @Eeems @matteodelabre