Makefile: Support usr-merged root filesystems#2781
Open
micromaomao wants to merge 1 commit into
Open
Conversation
Without this UVM built with this Makefile doesn't boot when using Azure Linux rootfs. This is a new version of microsoft#2485 Signed-off-by: Dominic Ayre <dominicayre@microsoft.com> Co-authored-by: Tingmao Wang <tingmaowang@microsoft.com> Signed-off-by: Tingmao Wang <tingmaowang@microsoft.com>
There was a problem hiding this comment.
Pull request overview
This PR updates the rootfs packaging logic in the repository’s Makefile so the generated UVM delta rootfs can boot correctly when the input base root filesystem is usr-merged (e.g., Azure Linux), where /bin is effectively provided via /usr/bin.
Changes:
- Detect whether the provided
$(BASE)rootfs is usr-merged by examining howbinis represented. - When usr-merged, create
rootfs/usr/binand makerootfs/bina symlink tousr/binto match expected binary locations. - Preserve existing behavior for non-usr-merged base rootfs inputs by creating
rootfs/binas a real directory.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
anmaxvl
approved these changes
Jun 19, 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.
Without this UVM built with this Makefile doesn't boot when using Azure Linux rootfs.
This is a new version of #2485
Signed-off-by: Dominic Ayre dominicayre@microsoft.com Signed-off-by: Tingmao Wang tingmaowang@microsoft.com