-
Notifications
You must be signed in to change notification settings - Fork 10
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
chore: replace x86_64-only Flatpaks with amd64 alternatives #215
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copied from the ublue-os/packages file, with Firefox replaced with Chromium.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can add this to the package itself when using aarch64. Putting a pin on this
Nono! |
Wanted to talk to p5 about this but I think this PR looks good |
It looks good! Im just thinking like, the stuff on overrides should be build on top of the existing build, everything that is not explicitly a override should work, always, no matter arch, no matter the overrides. putting the file copying before makes the non-overrides build "impure", thus it can break when certain files are or are not present on the overrides, that locks us into having those always when building images with the overrides like For example, imagine we have some systemd configuration that needs to be there specifically for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we can just have a sed -i
statement on a script under build_script/aarch64
instead of having this file here - think about the defaults, it should always be the non-overrides, then maybe do stuff like this if strictly necessary. In this case this would just add a bit of overhead when maintaining flatpaks because we would need to manually compare the files and see what we want.
@@ -32,20 +22,34 @@ copy_systemfiles_for() { | |||
WHAT=$1 | |||
shift | |||
printf "::group:: ===%s-file-copying===\n" "$WHAT" | |||
rsync -rvK "/var/tmp/system_files_overrides/$WHAT/" / |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this necessary? Usually rsync output is more verbose, I get not relying on it but I think we might need this here?
7919e07
to
03b2aaf
Compare
…ave the copy one)
03b2aaf
to
f540062
Compare
I'm not too sure how the overrides work, so please give this a good review :)
This replaces Firefox with Chromium (the next best option for a browser).
And removes Thunderbird, since it's not really needed when you have a browser.