Makefile: Support usr-merged root filesystems#2781
Conversation
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.
| rm -rf rootfs | ||
| mkdir -p rootfs/bin/ | ||
| rm -rf /tmp/base-rootfs && mkdir -p /tmp/base-rootfs | ||
| tar -xf $(BASE) -C /tmp/base-rootfs --no-anchored --no-recursion bin |
There was a problem hiding this comment.
chatted offline with @helsaawy , $(BASE) isn't being handled in this file, but in Makefile.bootfiles. maybe we should have an explicit makefile flag for usr-merged rootfs instead.
There was a problem hiding this comment.
@micromaomao , can you address above and lets merge it.
There was a problem hiding this comment.
I'm going to make the flag the default since we will not be building from Yocto again
There was a problem hiding this comment.
Actually to reduce opportunity of objection I've decided to make it non-default and will just update our build scripts instead
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> Assisted-by: GitHub-Copilot Signed-off-by: Tingmao Wang <tingmaowang@microsoft.com>
micromaomao
force-pushed
the
usr-merged-fs
branch
from
fe11650 to
f2d360e
Compare
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