Skip to content

build: order the mount tools before bootfs for fs=ramfs #1496

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
gburd wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

build: order the mount tools before bootfs for fs=ramfs #1496

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
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2233,6 +2233,15 @@ bootfs_dep += $(out)/modules/libext/libext.so
else
ifeq ($(fs),zfs)
bootfs_dep += $(tools:%=$(out)/%) $(out)/libsolaris.so
else
ifeq ($(fs),ramfs)
# For fs=ramfs, scripts/build passes $(out)/usr.manifest as the bootfs manifest,
# and that manifest is generated from usr_ramfs.manifest.skel, which lists
# tools/mount/mount-fs.so and tools/mount/umount.so. Without these the very
# first build of a fresh tree races: mkbootfs.py stats a tool nothing ordered
# and dies with FileNotFoundError.
bootfs_dep += $(out)/tools/mount/mount-fs.so $(out)/tools/mount/umount.so
endif
endif
endif
$(out)/bootfs.bin: $(bootfs_dep)
Expand Down