From 939dff71ae744c34ff5f1bbe52cf12841068b499 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 17 Nov 2016 21:44:53 -0700
Subject: [PATCH] Add hexdump, build filesystem in initfs

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d803df145..82d5e111b 100644
--- a/Makefile
+++ b/Makefile
@@ -333,7 +333,11 @@ initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
 	strip $@
 	rm $@.d
 
+initfs/filesystem.bin: $(BUILD)/filesystem.bin
+	cp $< $@
+
 $(BUILD)/initfs.rs: \
+		initfs/filesystem.bin \
 		initfs/bin/init \
 		initfs/bin/ahcid \
 		initfs/bin/pcid \
@@ -460,6 +464,7 @@ extrautils: \
 	filesystem/bin/cksum \
 	filesystem/bin/cur \
 	filesystem/bin/grep \
+	filesystem/bin/hexdump \
 	filesystem/bin/less \
 	filesystem/bin/man \
 	filesystem/bin/mdless \
@@ -525,7 +530,7 @@ $(BUILD)/filesystem.bin: \
 		filesystem/bin/tar
 	-$(FUMOUNT) $(BUILD)/filesystem/
 	rm -rf $@ $(BUILD)/filesystem/
-	echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 256
+	echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 64
 	mkdir -p $(BUILD)/filesystem/
 	cargo build --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse --release
 	schemes/redoxfs/target/release/redoxfs-fuse $@ $(BUILD)/filesystem/ &
-- 
GitLab