fix: remove ffmpeg-free from all images #582
Merged
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.
This fixes the build, which broke because
ffmpeg-free
was added to the recommends for thefirefox
rpm, which is in the base upstream image:https://src.fedoraproject.org/rpms/firefox/c/f4c7885a695292c6b3cdffa4239455f1b336307a?branch=rawhide
This means that when uBlue builds the main images and it tries to remove
libavcodec-free
, it fails becauselibavcodec-free
is a dependency offfmpeg-free
, which is now in the base upstream image.Adding
ffmpeg-free
to the removals list as well, as is done in this PR, allows rpm-ostree to go ahead with thelibavcodec-free
removal by telling it thatffmpeg-free
should also be removed.