diff --git a/mk/filesystem.mk b/mk/filesystem.mk index f181acb..5fab8d3 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,10 +1,10 @@ -build/filesystem.bin: filesystem.toml build/kernel prefix +build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release -$(FUMOUNT) build/filesystem/ || true rm -rf $@ $@.partial build/filesystem/ - dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)" + fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial cargo run --release \ --manifest-path redoxfs/Cargo.toml \ --bin redoxfs-mkfs \ @@ -13,10 +13,13 @@ build/filesystem.bin: filesystem.toml build/kernel prefix redoxfs/target/release/redoxfs $@.partial build/filesystem/ sleep 2 pgrep redoxfs - cp $< build/filesystem/filesystem.toml - cp build/kernel build/filesystem/kernel - cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include - cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib + cp -v $< build/filesystem/filesystem.toml + cp -v build/bootloader.bin build/filesystem/bootloader + cp -v build/kernel build/filesystem/kernel + mkdir -v build/filesystem/pkg + cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml + #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include + #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib $(INSTALLER) -c $< build/filesystem/ sync -$(FUMOUNT) build/filesystem/ || true