Skip to content

Makefile: Support usr-merged root filesystems #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micromaomao wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

Makefile: Support usr-merged root filesystems #2781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ include Makefile.bootfiles
# enable loading kernel modules in init
KMOD:=0

# whether the base rootfs uses a usr-merged layout (i.e. /bin is a symlink to
# /usr/bin). This defaults to disabled; set USR_MERGED_ROOTFS=1 for a
# usr-merged base rootfs such as Azure Linux.
USR_MERGED_ROOTFS:=0

CFLAGS:=-O2 -Wall
LDFLAGS:=-static -s #strip C binaries
LDLIBS:=
Expand Down Expand Up @@ -89,7 +94,12 @@ out/delta-snp.tar.gz: out/delta.tar.gz bin/internal/tools/snp-report boot/startu
out/delta.tar.gz: bin/init bin/vsockexec bin/cmd/gcs bin/cmd/gcstools bin/cmd/hooks/wait-paths Makefile
@mkdir -p out
rm -rf rootfs
mkdir -p rootfs/bin/
ifeq "$(USR_MERGED_ROOTFS)" "1"
mkdir -p rootfs/usr/bin
ln -s usr/bin rootfs/bin
else
mkdir -p rootfs/bin
endif
mkdir -p rootfs/info/
cp bin/init rootfs/
cp bin/vsockexec rootfs/bin/
Expand Down
Loading