image: bring back the pre-PR#462 BootcDiskImage#604
Merged
ondrejbudai merged 1 commit intoosbuild:mainfrom Apr 17, 2024
Merged
Conversation
This commit brings back the pre-PR#462 version of BootcDiskImage as BootcLegacyDiskImage. The rational is that right now we cannot use `bootc install to-filesystem` for cross arch building the FITRIM ioctl is not supported by qemu-user To fix this is requires any of the following: 1. ensure bootc-dev/bootc#462 is available everywhere we care about 2. ensure https://www.mail-archive.com/qemu-devel@nongnu.org/msg1034508.html is available everywhere we care about 3. bind mount /usr/bin/true over /usr/bin/fsfreeze inside the buildroot. This bind mount can be done via `org.osbuild.bind` but it leaks into the manifest and that does not feel great. So the alternative is to keep using the "old" pipeline that does not yet use `bootc install to-filesystem` to for cross-arch builds and the new pipeline for everything else. The selection will happen on the level of `bib`. This is all not nice and fragile and needs to be removed/reverted again but short term might be the only thing we can do.
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
2 participants
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 commit brings back the pre-PR#462 version of BootcDiskImage as BootcLegacyDiskImage. The rational is that right now we cannot use
bootc install to-filesystemfor cross arch building the FITRIM ioctl is not supported by qemu-userTo fix this is requires any of the following:
--skip-finalizebootc-dev/bootc#462 is available everywhere we care aboutorg.osbuild.bindbut it leaks into the manifest and that does not feel great.So the alternative is to keep using the "old" pipeline that does not yet use
bootc install to-filesystemto for cross-arch builds and the new pipeline for everything else. The selection will happen on the level ofbib.This is all not nice and fragile and needs to be removed/reverted again but short term might be the only thing we can do.
With that we can do in bib: