Repository navigation
Fix regression installing NoRuntime extensions such as openh264 - #6587
Merged
Merged
Conversation
When FlatpakDir runs extra-data helpers in apply_extra_data(), if the helper is statically linked, it might not need a runtime at all. For example the helper for openh264 falls into this category. Fixes: ac62ebe "run: Use O_PATH fds for the runtime and app deploy directories" Helps: flatpak#6583 Signed-off-by: Simon McVittie <[email protected]>
org.freedesktop.Platform.openh264 is one example of an extension that runs a statically-linked extra-data helper, with no runtime. Only open the runtime if there is one. Fixes: ac62ebe "run: Use O_PATH fds for the runtime and app deploy directories" Resolves: flatpak#6583 Signed-off-by: Simon McVittie <[email protected]>
Collaborator
Author
|
Not tested yet, but I think this is the right fix. |
Collaborator
Author
Yes, seems to work. Most easily tested with on a sufficiently expendable test machine. |
smcv
marked this pull request as ready for review
April 9, 2026 18:40
Collaborator
Author
|
cc @bertogg fyi |
bbhtt
approved these changes
Apr 10, 2026
Collaborator
|
It would be useful to have tests for the NoRuntime extra-data. |
Collaborator
|
here is a quick attempt to test this 37ad30e |
Collaborator
Author
Good thinking, I added it to this branch. |
swick
approved these changes
Apr 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
run: Cope with an empty runtime
When FlatpakDir runs extra-data helpers in apply_extra_data(),
if the helper is statically linked, it might not need a runtime at all.
For example the helper for openh264 falls into this category.
Fixes: ac62ebe "run: Use O_PATH fds for the runtime and app deploy directories"
Helps: [Bug]: 1.16.5: Failed to apply extra-data: "Bad address" when installing org.freedesktop.Platform.openh264 #6583
dir: In apply_extra_data(), don't assume there is always a runtime
org.freedesktop.Platform.openh264 is one example of an extension that
runs a statically-linked extra-data helper, with no runtime. Only open
the runtime if there is one.
Fixes: ac62ebe "run: Use O_PATH fds for the runtime and app deploy directories"
Resolves: [Bug]: 1.16.5: Failed to apply extra-data: "Bad address" when installing org.freedesktop.Platform.openh264 #6583