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

[display] add remux.service.conf override to display package on rm2 #338

Merged
merged 7 commits into from
May 7, 2021

Conversation

raisjn
Copy link
Contributor

@raisjn raisjn commented Apr 10, 2021

this turns on the display shim for remux on rm2 apps. the reasoning for this is so that people can launch homebrew apps that they compiled from other sources without having to use patchelf.

TEST PLAN:

  • install display package on rm2, verify that /etc/systemd/system/remux.service.d/remux.service.conf exists and has an Environment= line in it
  • restart remux, verify that applications can be launched
  • custom compile an application without patchself (or remove the DT needed using patchelf) and verify remux can launch it

this turns on the display shim for remux on rm2 apps

TEST PLAN:

* install display package on rm2, verify that
/etc/systemd/system/remux.service.d/remux.override.conf exist
* restart remux, verify that applications can be launched
* custom compile an application without patchself (or remove the DT
needed using patchelf) and verify remux can launch it
@raisjn
Copy link
Contributor Author

raisjn commented Apr 10, 2021

over time, if everyone starts using patchelf, this may be less and less needed. before then, i will work on being able to disable the preload on an app by app basis so people can disable it if they like.

this PR is related to #337

@matteodelabre
Copy link
Member

Thanks for raising this point @raisjn. I agree with you. The current state of things is that all apps that work on rM2 assume that they’ll be used with LD_PRELOAD, so making a hard transition to requiring each of those apps to be patchelf-ed will confuse users. For consistency, this should be applied to all the launchers, not only remux (any thoughts on this @Eeems @dixonary?).

In the long run (if everyone agrees that this is a good thing to do), I think we should update rm2fb’s docs to recommend that users use patchelf when they self-compile their apps and do not rely on LD_PRELOAD being there. We could also open issues with rM2-compatible projects to ask if they can update their build instructions and pre-built binaries too.

@Eeems
Copy link
Member

Eeems commented Apr 12, 2021

I'm okay with applying this to Oxide as well for now. I do think that patchelf is the right longer term solution though.

@Eeems Eeems added the packages Add or improve packages of the repository label Apr 20, 2021
@matteodelabre
Copy link
Member

I moved those overrides to the rm2fb-client package as they depend on the librm2fb_client library, which is provided by that package instead of display. I also renamed the files to a name that more explicitly states their intent.

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 tested it on my rM2 by removing the librm2fb_client dependency on the calculator binary and starting the app from each of the three launchers. This is ready for merging if you agree with my minor changes above @raisjn

@raisjn raisjn merged commit f7de098 into testing May 7, 2021
@matteodelabre matteodelabre deleted the display-add-remux-overrides branch May 7, 2021 20:03
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.

None yet

3 participants